Changeset 105949 in vbox for trunk/src/libs/openssl-3.1.7/crypto/ec/ecdsa_ossl.c

Timestamp:

Sep 4, 2024 12:53:14 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164683

Message:

openssl-3.1.7: Applied and adjusted our OpenSSL changes to 3.1.7. bugref:10757

File:

• trunk/src/libs/openssl-3.1.7/crypto/ec/ecdsa_ossl.c (modified) (5 diffs)

trunk/src/libs/openssl-3.1.7/crypto/ec/ecdsa_ossl.c

@@ -1 +1 @@
 /*
- * Copyright 2002-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -71 +71 @@
     ECDSA_SIG *s;
 
-    if (sig == NULL && (kinv == NULL || r == NULL)) {
-        *siglen = ECDSA_size(eckey);
-        return 1;
-    }
-
     s = ECDSA_do_sign_ex(dgst, dlen, kinv, r, eckey);
     if (s == NULL) {
@@ -131 +126 @@
         goto err;
     }
-
-    if ((order = EC_GROUP_get0_order(group)) == NULL) {
-        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
-        goto err;
-    }
+    order = EC_GROUP_get0_order(group);
 
     /* Preallocate space */
@@ -150 +141 @@
         do {
             if (dgst != NULL) {
-                if (!ossl_bn_gen_dsa_nonce_fixed_top(k, order, priv_key,
-                                                     dgst, dlen, ctx)) {
+                if (!BN_generate_dsa_nonce(k, order, priv_key,
+                                           dgst, dlen, ctx)) {
                     ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
                     goto err;
                 }
             } else {
-                if (!ossl_bn_priv_rand_range_fixed_top(k, order, 0, ctx)) {
+                if (!BN_priv_rand_range_ex(k, order, 0, ctx)) {
                     ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
                     goto err;
                 }
             }
-        } while (ossl_bn_is_word_fixed_top(k, 0));
+        } while (BN_is_zero(k));
 
         /* compute r the x-coordinate of generator * k */
@@ -260 +251 @@
     }
 
-    if ((order = EC_GROUP_get0_order(group)) == NULL) {
-        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
-        goto err;
-    }
-
+    order = EC_GROUP_get0_order(group);
     i = BN_num_bits(order);
     /*