Upgrade go crypto and adapt SEIPD

2023-01-25 14:42:41 +01:00 · 2023-01-25 14:42:41 +01:00 · 47534e9288
commit 47534e9288
parent 2adafdb885
3 changed files with 13 additions and 4 deletions
--- 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")
 	}