From 7291d87398441172a907f96286b25dc12dc8bc4c Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Tue, 17 Oct 2017 21:50:31 -0600 Subject: [PATCH] Add more trimming --- connect.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/connect.go b/connect.go index ed8b0dd..c8cb106 100644 --- a/connect.go +++ b/connect.go @@ -133,22 +133,23 @@ func receiveFile(id int, connection net.Conn, codePhrase string) (fileNameToRece bufferFileName := make([]byte, 64) connection.Read(bufferFileName) fileNameToReceive = strings.Trim(string(bufferFileName), ":") - logger.Debugf("fileName: %v", fileNameToReceive) + logger.Debugf("fileName: [%s]", fileNameToReceive) ivHex := make([]byte, BUFFERSIZE) connection.Read(ivHex) iv = strings.Trim(strings.TrimSpace(string(ivHex)), ":") - logger.Debugf("iv: %s", iv) + iv = strings.Replace(iv, ":", "", -1) + logger.Debugf("iv: [%s]", iv) saltHex := make([]byte, BUFFERSIZE) connection.Read(saltHex) salt = strings.Trim(strings.TrimSpace(string(saltHex)), ":") - logger.Debugf("salt: %s", salt) + logger.Debugf("salt: [%s]", salt) hashOfFileBytes := make([]byte, BUFFERSIZE) connection.Read(hashOfFileBytes) hashOfFile = strings.Trim(strings.TrimSpace(string(hashOfFileBytes)), ":") - logger.Debugf("hashOfFile: %s", hashOfFile) + logger.Debugf("hashOfFile: [%s]", hashOfFile) os.Remove(fileNameToReceive + "." + strconv.Itoa(id)) newFile, err := os.Create(fileNameToReceive + "." + strconv.Itoa(id))