Drop useless ossl_ prefixes

discussed with jsing

2 files changed, 23 insertions, 10 deletions

diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c
index bac5b6e28d..5efb49ba59 100644
--- a/src/lib/libcrypto/ecdh/ech_key.c
+++ b/src/lib/libcrypto/ecdh/ech_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_key.c,v 1.32 2023/07/02 11:29:36 tb Exp $ */
+/* $OpenBSD: ech_key.c,v 1.33 2023/07/05 08:39:40 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -85,12 +85,11 @@
  */
 /* XXX - KDF handling moved to ECDH_compute_key().  See OpenSSL e2285d87. */
 int
-ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-    EC_KEY *ecdh,
+ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
     void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
 {
         BN_CTX *ctx;
-        BIGNUM *x;
+        BIGNUM *cofactor, *x;
         const BIGNUM *priv_key;
         const EC_GROUP *group;
         EC_POINT *point = NULL;
@@ -111,11 +110,8 @@ ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
 
         if ((x = BN_CTX_get(ctx)) == NULL)
                 goto err;
-
-        if ((priv_key = EC_KEY_get0_private_key(ecdh)) == NULL) {
-                ECDHerror(ECDH_R_NO_PRIVATE_VALUE);
+        if ((cofactor = BN_CTX_get(ctx)) == NULL)
                 goto err;
-        }
 
         if ((group = EC_KEY_get0_group(ecdh)) == NULL)
                 goto err;
@@ -128,6 +124,23 @@ ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                 goto err;
         }
 
+        if ((priv_key = EC_KEY_get0_private_key(ecdh)) == NULL) {
+                ECDHerror(ECDH_R_NO_PRIVATE_VALUE);
+                goto err;
+        }
+
+        if ((EC_KEY_get_flags(ecdh) & EC_FLAG_COFACTOR_ECDH) != 0) {
+                if (!EC_GROUP_get_cofactor(group, cofactor, NULL)) {
+                        ECDHerror(ERR_R_EC_LIB);
+                        goto err;
+                }
+                if (!BN_mul(cofactor, cofactor, priv_key, ctx)) {
+                        ECDHerror(ERR_R_BN_LIB);
+                        goto err;
+                }
+                priv_key = cofactor;
+        }
+
         if (!EC_POINT_mul(group, point, NULL, pub_key, priv_key, ctx)) {
                 ECDHerror(ECDH_R_POINT_ARITHMETIC_FAILURE);
                 goto err;
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
index eb1b6bfebc..52019b01c1 100644
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ b/src/lib/libcrypto/ecdh/ech_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_lib.c,v 1.22 2023/06/25 19:17:43 tb Exp $ */
+/* $OpenBSD: ech_lib.c,v 1.23 2023/07/05 08:39:40 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -90,7 +90,7 @@ static const ECDH_METHOD *default_ECDH_method = NULL;
 
 static const ECDH_METHOD openssl_ecdh_meth = {
         .name = "OpenSSL ECDH method",
-        .compute_key = ossl_ecdh_compute_key,
+        .compute_key = ecdh_compute_key,
 };
 
 const ECDH_METHOD *