From 63664b7e78e5eb1e4d431a0bbe154aeeb4403417 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Tue, 17 Oct 2017 21:48:35 -0600 Subject: [PATCH] Add more trimming --- connect.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connect.go b/connect.go index 8ad556a6..ed8b0dd4 100644 --- a/connect.go +++ b/connect.go @@ -137,17 +137,17 @@ func receiveFile(id int, connection net.Conn, codePhrase string) (fileNameToRece ivHex := make([]byte, BUFFERSIZE) connection.Read(ivHex) - iv = strings.Trim(string(ivHex), ":") + iv = strings.Trim(strings.TrimSpace(string(ivHex)), ":") logger.Debugf("iv: %s", iv) saltHex := make([]byte, BUFFERSIZE) connection.Read(saltHex) - salt = strings.Trim(string(saltHex), ":") + salt = strings.Trim(strings.TrimSpace(string(saltHex)), ":") logger.Debugf("salt: %s", salt) hashOfFileBytes := make([]byte, BUFFERSIZE) connection.Read(hashOfFileBytes) - hashOfFile = strings.Trim(string(hashOfFileBytes), ":") + hashOfFile = strings.Trim(strings.TrimSpace(string(hashOfFileBytes)), ":") logger.Debugf("hashOfFile: %s", hashOfFile) os.Remove(fileNameToReceive + "." + strconv.Itoa(id))