Update various EC algorithms and tests to use normalize and

getAffine[XY]Coord when working with curves that might now be using
non-affine coordinates internally

1 files changed, 4 insertions, 4 deletions

diff --git a/core/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java b/core/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java
index f4dfc6ed..b5a145ac 100755
--- a/core/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java
+++ b/core/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java
@@ -128,11 +128,11 @@ public class ECIESKeyEncapsulation
             rPrime = r;
         }
 
-        ECPoint hTilde = ((ECPublicKeyParameters)key).getQ().multiply(rPrime);
+        ECPoint hTilde = ((ECPublicKeyParameters)key).getQ().multiply(rPrime).normalize();
 
         // Encode the shared secret value
         int PEHlen = (key.getParameters().getCurve().getFieldSize() + 7) / 8;
-        byte[] PEH = BigIntegers.asUnsignedByteArray(PEHlen, hTilde.getX().toBigInteger());
+        byte[] PEH = BigIntegers.asUnsignedByteArray(PEHlen, hTilde.getAffineXCoord().toBigInteger());
 
         // Initialise the KDF
         byte[] kdfInput;
@@ -215,11 +215,11 @@ public class ECIESKeyEncapsulation
             xHat = ((ECPrivateKeyParameters)key).getD();
         }
 
-        ECPoint hTilde = gHat.multiply(xHat);
+        ECPoint hTilde = gHat.multiply(xHat).normalize();
 
         // Encode the shared secret value
         int PEHlen = (key.getParameters().getCurve().getFieldSize() + 7) / 8;
-        byte[] PEH = BigIntegers.asUnsignedByteArray(PEHlen, hTilde.getX().toBigInteger());
+        byte[] PEH = BigIntegers.asUnsignedByteArray(PEHlen, hTilde.getAffineXCoord().toBigInteger());
 
         // Initialise the KDF
         byte[] kdfInput;