From 2f611b76e1e584fcc2d2a114b2b71679430bbdc4 Mon Sep 17 00:00:00 2001
From: larabr <7375870+larabr@users.noreply.github.com>
Date: Fri, 31 Jul 2020 17:26:26 +0200
Subject: [PATCH] Apply review changes

---
 openpgp/ecdh/ecdh.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpgp/ecdh/ecdh.go b/openpgp/ecdh/ecdh.go
index e904f8a1..e7083012 100644
--- 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
 	}