1 files changed, 9 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ec/ecp_oct.c b/src/lib/libcrypto/ec/ecp_oct.c
index 90c5ca2e4e..29d9990546 100644
--- a/src/lib/libcrypto/ec/ecp_oct.c
+++ b/src/lib/libcrypto/ec/ecp_oct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_oct.c,v 1.11 2018/07/15 16:27:39 tb Exp $ */
+/* $OpenBSD: ecp_oct.c,v 1.12 2020/12/04 08:55:30 tb Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -362,6 +362,10 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
                 goto err;
         }
         if (form == POINT_CONVERSION_COMPRESSED) {
+                /*
+                 * EC_POINT_set_compressed_coordinates_GFp checks that the point
+                 * is on the curve as required by X9.62.
+                 */
                 if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx))
                         goto err;
         } else {
@@ -377,15 +381,14 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
                                 goto err;
                         }
                 }
+                /*
+                 * EC_POINT_set_affine_coordinates_GFp checks that the point is
+                 * on the curve as required by X9.62.
+                 */
                 if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx))
                         goto err;
         }
 
-        /* test required by X9.62 */
-        if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {
-                ECerror(EC_R_POINT_IS_NOT_ON_CURVE);
-                goto err;
-        }
         ret = 1;
 
  err: