From 2d6df561467e24550f880eb7f200dd260a7df51b Mon Sep 17 00:00:00 2001
From: John Jiang <johnsjiang@tencent.com>
Date: Wed, 17 Jan 2024 12:56:23 +0800
Subject: [PATCH] TKSS-639: Backport JDK-8320449: ECDHKeyAgreement should
 validate parameters before using them

---
 .../sun/security/ec/ECDHKeyAgreement.java     | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/kona-crypto/src/main/java/com/tencent/kona/sun/security/ec/ECDHKeyAgreement.java b/kona-crypto/src/main/java/com/tencent/kona/sun/security/ec/ECDHKeyAgreement.java
index edbadbb6..11be9e84 100644
--- a/kona-crypto/src/main/java/com/tencent/kona/sun/security/ec/ECDHKeyAgreement.java
+++ b/kona-crypto/src/main/java/com/tencent/kona/sun/security/ec/ECDHKeyAgreement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,11 @@
 
 package com.tencent.kona.sun.security.ec;
 
-import com.tencent.kona.sun.security.ec.point.AffinePoint;
 import com.tencent.kona.sun.security.ec.point.Point;
 import com.tencent.kona.sun.security.util.ArrayUtil;
 import com.tencent.kona.sun.security.util.CurveDB;
 import com.tencent.kona.sun.security.util.ECUtil;
 import com.tencent.kona.sun.security.util.NamedCurve;
-import com.tencent.kona.sun.security.util.math.ImmutableIntegerModuloP;
 import com.tencent.kona.sun.security.util.math.IntegerFieldModuloP;
 import com.tencent.kona.sun.security.util.math.MutableIntegerModuloP;
 import com.tencent.kona.sun.security.util.math.SmallValue;
@@ -81,22 +79,27 @@ public ECDHKeyAgreement() {
     // Generic init
     private void init(Key key) throws
         InvalidKeyException, InvalidAlgorithmParameterException {
+        privateKey = null;
+        privateKeyOps = null;
+        publicKey = null;
+
         if (!(key instanceof PrivateKey)) {
             throw new InvalidKeyException("Key must be instance of PrivateKey");
         }
-        privateKey = (ECPrivateKey)ECKeyFactory.toECKey(key);
-        publicKey = null;
 
-        namedCurve = CurveDB.lookup(privateKey.getParams());
+        ECPrivateKey ecPrivateKey = (ECPrivateKey)ECKeyFactory.toECKey(key);
         Optional<ECOperations> opsOpt =
-                ECOperations.forParameters(privateKey.getParams());
-        if (!opsOpt.isPresent()) {
+            ECOperations.forParameters(ecPrivateKey.getParams());
+        if (opsOpt.isEmpty()) {
+            NamedCurve nc = CurveDB.lookup(ecPrivateKey.getParams());
             throw new InvalidAlgorithmParameterException(
-                    "Curve not supported: " + (namedCurve != null ? namedCurve.toString() :
-                            "unknown"));
+                "Curve not supported: " + (nc != null ? nc.toString() :
+                    "unknown"));
         }
+        ECUtil.checkPrivateKey(ecPrivateKey);
+
+        privateKey = ecPrivateKey;
         privateKeyOps = opsOpt.get();
-        ECUtil.checkPrivateKey(privateKey);
     }
 
     // see JCE spec
@@ -141,26 +144,22 @@ protected Key engineDoPhase(Key key, boolean lastPhase)
                 ("Key must be a PublicKey with algorithm EC");
         }
 
+        // Validate public key
+        validate(privateKeyOps, (ECPublicKey) key);
+
         this.publicKey = (ECPublicKey) key;
 
         int keyLenBits =
             publicKey.getParams().getCurve().getField().getFieldSize();
         secretLen = (keyLenBits + 7) >> 3;
 
-        // Validate public key
-        validate(privateKeyOps, publicKey);
-
         return null;
     }
 
     // Verify that x and y are integers in the interval [0, p - 1].
     private static void validateCoordinate(BigInteger c, BigInteger mod)
         throws InvalidKeyException{
-        if (c.compareTo(BigInteger.ZERO) < 0) {
-            throw new InvalidKeyException("Invalid coordinate");
-        }
-
-        if (c.compareTo(mod) >= 0) {
+        if (c.compareTo(BigInteger.ZERO) < 0 || c.compareTo(mod) >= 0) {
             throw new InvalidKeyException("Invalid coordinate");
         }
     }