This commit is contained in:
N
2022-09-02 12:07:21 +02:00
parent 3966299a91
commit 6d183d2b59
21 changed files with 524 additions and 289 deletions

View File

@ -66,41 +66,41 @@ func Decrypt(privateKey string, data []byte) ([]byte, error) {
if err != nil {
log.Error().Msg("Message decryption b64 failed")
}
decrypted, err := helper.DecryptBinaryMessageArmored(string(priv), []byte(""), string(data))
decrypted, err := helper.DecryptBinaryMessageArmored(string(priv), nil, string(data))
if err != nil {
log.Error().Msg("Message decryption failed")
}
return []byte(decrypted), err
}
func EncryptAndSign(publicKey string, privateKey string, data []byte) ([]byte, []byte, error) {
pub, err := base64.StdEncoding.DecodeString(publicKey)
func EncryptAndSign(publicEncKey string, privateSignKey string, data []byte) ([]byte, []byte, error) {
pub, err := base64.StdEncoding.DecodeString(publicEncKey)
if err != nil {
log.Error().Msg("Message encryption and sign b64 failed")
}
priv, err := base64.StdEncoding.DecodeString(privateKey)
priv, err := base64.StdEncoding.DecodeString(privateSignKey)
if err != nil {
log.Error().Msg("Message encryption and sign b64 failed")
}
armor, signature, err := helper.EncryptSignBinaryDetached(string(pub), string(priv), []byte(""), data)
encrypted, signature, err := helper.EncryptSignBinaryDetached(string(pub), string(priv), nil, data)
if err != nil {
log.Error().Msg("Message encryption and sign failed")
}
return []byte(armor), []byte(signature), err
return []byte(encrypted), []byte(signature), err
}
func DecryptAndSign(publicKey string, privateKey string, data []byte, signature []byte) ([]byte, error) {
pub, err := base64.StdEncoding.DecodeString(publicKey)
func DecryptAndCheck(MyPrivateEncryptionKey string, peerContactPublicKey string, data []byte, signature []byte) (DecryptedMessage []byte, err error) {
pub, err := base64.StdEncoding.DecodeString(MyPrivateEncryptionKey)
if err != nil {
log.Error().Msg("Message decryption and sign b64 failed")
}
priv, err := base64.StdEncoding.DecodeString(privateKey)
priv, err := base64.StdEncoding.DecodeString(peerContactPublicKey)
if err != nil {
log.Error().Msg("Message decryption and sign b64 failed")
}
decrypted, err := helper.DecryptVerifyBinaryDetached(string(pub), string(priv), []byte(""), data, string(signature))
DecryptedMessage, err = helper.DecryptVerifyBinaryDetached(string(pub), string(priv), nil, data, string(signature))
if err != nil {
log.Error().Msg("Message decryption and sign failed")
}
return decrypted, err
return DecryptedMessage, err
}