From 47534e928863b11d88f73b3217e25213ef538eb8 Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Wed, 25 Jan 2023 14:42:41 +0100 Subject: [PATCH] Upgrade go crypto and adapt SEIPD --- crypto/sessionkey.go | 10 +++++++++- go.mod | 2 +- go.sum | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/crypto/sessionkey.go b/crypto/sessionkey.go index 9750544..c8c4dcf 100644 --- a/crypto/sessionkey.go +++ b/crypto/sessionkey.go @@ -239,7 +239,15 @@ func encryptStreamWithSessionKey( signEntity *openpgp.Entity, config *packet.Config, ) (encryptWriter, signWriter io.WriteCloser, err error) { - encryptWriter, err = packet.SerializeSymmetricallyEncrypted(dataPacketWriter, config.Cipher(), sk.Key, config) + encryptWriter, err = packet.SerializeSymmetricallyEncrypted( + dataPacketWriter, + config.Cipher(), + config.AEAD() != nil, + packet.CipherSuite{Cipher: config.Cipher(), Mode: config.AEAD().Mode()}, + sk.Key, + config, + ) + if err != nil { return nil, nil, errors.Wrap(err, "gopenpgp: unable to encrypt") } diff --git a/go.mod b/go.mod index 30485d1..4c1d14a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ProtonMail/gopenpgp/v2 go 1.15 require ( - github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 + github.com/ProtonMail/go-crypto v0.0.0-20230124153114-0acdc8ae009b github.com/ProtonMail/go-mime v0.0.0-20221031134845-8fd9bc37cf08 github.com/davecgh/go-spew v1.1.1 // indirect github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 7f880c4..3fc6431 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,7 @@ +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I= -github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= +github.com/ProtonMail/go-crypto v0.0.0-20230124153114-0acdc8ae009b h1:1DHH9haxfhaVM8owXQjLdn7UP4AkDfzSdiRoLdcSCqE= +github.com/ProtonMail/go-crypto v0.0.0-20230124153114-0acdc8ae009b/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= github.com/ProtonMail/go-mime v0.0.0-20221031134845-8fd9bc37cf08 h1:dS7r5z4iGS0qCjM7UwWdsEMzQesUQbGcXdSm2/tWboA= github.com/ProtonMail/go-mime v0.0.0-20221031134845-8fd9bc37cf08/go.mod h1:qRZgbeASl2a9OwmsV85aWwRqic0NHPh+9ewGAzb4cgM= github.com/ProtonMail/go-mobile v0.0.0-20210326110230-f181c70e4e2b h1:XVeh08xp93T+xK6rzpCSQTZ+LwEo+ASHvOifrQ5ZgEE=