mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

encrypt only if flagged

Browse source
This commit is contained in:
Zack Scholl 2018-07-02 07:36:31 -07:00
parent ba3fa6ffce
commit bc34811750
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/files.go
View file

@ -114,19 +114,23 @@ func (c *Croc) getFilesReady() (err error) {
log.Error(err) log.Error(err)
return return
} }
// encrypt file data if c.UseEncryption {
c.crocFileEncrypted = tempFileName("croc-encrypted") // encrypt file data
err = encryptFile(c.crocFile, c.crocFileEncrypted, passphrase) c.crocFileEncrypted = tempFileName("croc-encrypted")
if err != nil { err = encryptFile(c.crocFile, c.crocFileEncrypted, passphrase)
log.Error(err) if err != nil {
return log.Error(err)
return
}
// remove the unencrypted versoin
if err = os.Remove(c.crocFile); err != nil {
log.Error(err)
return
}
c.cs.channel.fileMetaData.IsEncrypted = true
} else {
c.crocFileEncrypted = c.crocFile
} }
// remove the unencrypted versoin
if err = os.Remove(c.crocFile); err != nil {
log.Error(err)
return
}
c.cs.channel.fileMetaData.IsEncrypted = true
// split into pieces to send // split into pieces to send
log.Debugf("splitting %s", c.crocFileEncrypted) log.Debugf("splitting %s", c.crocFileEncrypted)
if err = splitFile(c.crocFileEncrypted, len(c.cs.channel.Ports)); err != nil { if err = splitFile(c.crocFileEncrypted, len(c.cs.channel.Ports)); err != nil {
@ -200,12 +204,14 @@ func (c *Croc) processReceivedFile() (err error) {
log.Error(err) log.Error(err)
return return
} }
err = decryptFile(c.crocFileEncrypted, c.crocFile, passphrase) if c.UseEncryption {
if err != nil { err = decryptFile(c.crocFileEncrypted, c.crocFile, passphrase)
log.Error(err) if err != nil {
return log.Error(err)
return
}
os.Remove(c.crocFileEncrypted)
} }
os.Remove(c.crocFileEncrypted)
// check hash // check hash
log.Debug("checking hash") log.Debug("checking hash")