Apply review changes

ProtonMail · Jul 12, 2022 · 487a6ae · 487a6ae
1 parent d07eadf
commit 487a6ae
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/openpgp/ecdh/ecdh.go b/openpgp/ecdh/ecdh.go
@@ -153,15 +153,16 @@ func buildKey(pub *PublicKey, zb []byte, curveOID, fingerprint []byte, stripLead
 	if _, err := param.Write(algo); err != nil {
 		return nil, err
 	}
-	kdf := pub.KDF.ReplacementKDFParams
-	if kdf == nil {
+	if pub.KDF.ReplacementKDFParams != nil {
+		kdf := pub.KDF.ReplacementKDFParams
+		if _, err := param.Write(kdf); err != nil {
+			return nil, err
+		}
+	} else {
 		if err := pub.KDF.serialize(param); err != nil {
 			return nil, err
 		}
 	}
-	if _, err := param.Write(kdf); err != nil {
-		return nil, err
-	}
 	if _, err := param.Write([]byte("Anonymous Sender    ")); err != nil {
 		return nil, err
 	}