Elara6331
/
opensend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch from AES-256-GCM to ChaCha20-Poly1305

This commit is contained in:
Elara 2021-02-26 01:48:26 -08:00
parent a3e365afdd
commit ac115b592a
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fileCrypto.go
View File

@ -18,14 +18,13 @@ package main
import ( import (
"bytes" "bytes"
"crypto/aes"
"crypto/cipher"
"crypto/md5" "crypto/md5"
"crypto/rand" "crypto/rand"
"encoding/hex" "encoding/hex"
"github.com/klauspost/compress/zstd" "github.com/klauspost/compress/zstd"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"golang.org/x/crypto/chacha20poly1305"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -67,25 +66,20 @@ func CompressAndEncryptFile(filePath string, newFilePath string, sharedKey strin
md5Hash.Write([]byte(sharedKey)) md5Hash.Write([]byte(sharedKey))
// Encode md5 hash bytes into hexadecimal // Encode md5 hash bytes into hexadecimal
hashedKey := hex.EncodeToString(md5Hash.Sum(nil)) hashedKey := hex.EncodeToString(md5Hash.Sum(nil))
// Create new AES cipher // Create new AES c20cipher
block, err := aes.NewCipher([]byte(hashedKey)) c20cipher, err := chacha20poly1305.NewX([]byte(hashedKey))
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Error creating AES cipher") log.Fatal().Err(err).Msg("Error creating ChaCha20-Poly1305 cipher")
}
// Create GCM for AES cipher
gcm, err := cipher.NewGCM(block)
if err != nil {
log.Fatal().Err(err).Msg("Error creating GCM")
} }
// Make byte slice for nonce // Make byte slice for nonce
nonce := make([]byte, gcm.NonceSize()) nonce := make([]byte, c20cipher.NonceSize())
// Read random bytes into nonce slice // Read random bytes into nonce slice
_, err = io.ReadFull(rand.Reader, nonce) _, err = io.ReadFull(rand.Reader, nonce)
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Error creating nonce") log.Fatal().Err(err).Msg("Error creating nonce")
} }
// Encrypt data // Encrypt data
ciphertext := gcm.Seal(nonce, nonce, data, nil) ciphertext := c20cipher.Seal(nonce, nonce, data, nil)
// Create new file // Create new file
newFile, err := os.Create(newFilePath) newFile, err := os.Create(newFilePath)
if err != nil { if err != nil {
@ -116,18 +110,16 @@ func DecryptAndDecompressFile(filePath string, newFilePath string, sharedKey str
md5Hash.Write([]byte(sharedKey)) md5Hash.Write([]byte(sharedKey))
hashedKey := hex.EncodeToString(md5Hash.Sum(nil)) hashedKey := hex.EncodeToString(md5Hash.Sum(nil))
// Create new AES cipher // Create new AES cipher
block, _ := aes.NewCipher([]byte(hashedKey)) c20cipher, err := chacha20poly1305.NewX([]byte(hashedKey))
// Create GCM for AES cipher
gcm, err := cipher.NewGCM(block)
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Error creating GCM") log.Fatal().Err(err).Msg("Error creating ChaCha20-Poly1305 cipher")
} }
// Get standard GCM nonce size // Get standard GCM nonce size
nonceSize := gcm.NonceSize() nonceSize := c20cipher.NonceSize()
// Get nonce and ciphertext from data // Get nonce and ciphertext from data
nonce, ciphertext := data[:nonceSize], data[nonceSize:] nonce, ciphertext := data[:nonceSize], data[nonceSize:]
// Decrypt data // Decrypt data
plaintext, err := gcm.Open(nil, nonce, ciphertext, nil) plaintext, err := c20cipher.Open(nil, nonce, ciphertext, nil)
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Error decrypting data") log.Fatal().Err(err).Msg("Error decrypting data")
} }

1
go.mod
View File

@ -10,4 +10,5 @@ require (
github.com/pkg/browser v0.0.0-20201112035734-206646e67786 github.com/pkg/browser v0.0.0-20201112035734-206646e67786
github.com/rs/zerolog v1.20.0 github.com/rs/zerolog v1.20.0
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
) )