# HG changeset patch
# User igerasim
# Date 1495564225 25200
# Node ID a2a33977067891275621570c7c14de59b380e7a7
# Parent  5ccb8bdab06c754ab1e466f81caa0906d7e54c82
8178135: Additional elliptic curve support
Reviewed-by: mullan

diff -r 5ccb8bdab06c -r a2a339770678 src/share/native/sun/security/ec/impl/ecp_jac.c
--- a/src/share/native/sun/security/ec/impl/ecp_jac.c	Wed Mar 15 10:58:05 2017 -0700
+++ b/src/share/native/sun/security/ec/impl/ecp_jac.c	Tue May 23 11:30:25 2017 -0700
@@ -181,6 +181,15 @@
         MP_CHECKOK(group->meth->field_mul(&A, qx, &A, group->meth));
         MP_CHECKOK(group->meth->field_mul(&B, qy, &B, group->meth));
 
+        /*
+         * Additional checks for point equality and point at infinity
+         */
+        if (mp_cmp(px, &A) == 0 && mp_cmp(py, &B) == 0) {
+            /* POINT_DOUBLE(P) */
+            MP_CHECKOK(ec_GFp_pt_dbl_jac(px, py, pz, rx, ry, rz, group));
+            goto CLEANUP;
+        }
+
         /* C = A - px, D = B - py */
         MP_CHECKOK(group->meth->field_sub(&A, px, &C, group->meth));
         MP_CHECKOK(group->meth->field_sub(&B, py, &D, group->meth));
diff -r 5ccb8bdab06c -r a2a339770678 src/share/native/sun/security/ec/impl/ecp_jm.c
--- a/src/share/native/sun/security/ec/impl/ecp_jm.c	Wed Mar 15 10:58:05 2017 -0700
+++ b/src/share/native/sun/security/ec/impl/ecp_jm.c	Tue May 23 11:30:25 2017 -0700
@@ -166,6 +166,16 @@
         MP_CHECKOK(group->meth->field_mul(A, qx, A, group->meth));
         MP_CHECKOK(group->meth->field_mul(B, qy, B, group->meth));
 
+        /*
+         * Additional checks for point equality and point at infinity
+         */
+        if (mp_cmp(px, A) == 0 && mp_cmp(py, B) == 0) {
+            /* POINT_DOUBLE(P) */
+            MP_CHECKOK(ec_GFp_pt_dbl_jm(px, py, pz, paz4, rx, ry, rz, raz4,
+                                        scratch, group));
+            goto CLEANUP;
+        }
+
         /* C = A - px, D = B - py */
         MP_CHECKOK(group->meth->field_sub(A, px, C, group->meth));
         MP_CHECKOK(group->meth->field_sub(B, py, D, group->meth));