Changeset 105945 in vbox for trunk/src/libs/openssl-3.1.7/crypto/ec

Timestamp:

Sep 4, 2024 11:32:47 AM (6 months ago)

Author:

vboxsync

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

164679

Message:

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

Location:

trunk/src/libs/openssl-3.1.7

Files:

• . (modified) (1 prop)
• crypto/ec/build.info (modified) (1 diff)
• crypto/ec/curve448/arch_64/f_impl64.c (modified) (2 diffs)
• crypto/ec/ecdsa_ossl.c (modified) (5 diffs)

trunk/src/libs/openssl-3.1.7

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

trunk/src/libs/openssl-3.1.7/crypto/ec/build.info

@@ -78 +78 @@
 # has, and doesn't need it added again.
 IF[{- !$disabled{module} && !$disabled{shared} -}]
-  DEFINE[../providers/liblegacy.a]=$ECDEF
+  DEFINE[../../providers/liblegacy.a]=$ECDEF
 ENDIF
 

trunk/src/libs/openssl-3.1.7/crypto/ec/curve448/arch_64/f_impl64.c

@@ -1 +1 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2024 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2014 Cryptography Research, Inc.
  *
@@ -46 +46 @@
         }
         for (; j < 4; j++) {
-            accum2 += widemul(a[j], b[i - j + 8]);
-            accum1 += widemul(aa[j], bbb[i - j + 4]);
-            accum0 += widemul(a[j + 4], bb[i - j + 4]);
+            accum2 += widemul(a[j], b[i + 8 - j]);
+            accum1 += widemul(aa[j], bbb[i + 4 - j]);
+            accum0 += widemul(a[j + 4], bb[i + 4 - j]);
         }
 

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2024 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) {
@@ -126 +131 @@
         goto err;
     }
-    order = EC_GROUP_get0_order(group);
+
+    if ((order = EC_GROUP_get0_order(group)) == NULL) {
+        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+        goto err;
+    }
 
     /* Preallocate space */
@@ -141 +150 @@
         do {
             if (dgst != NULL) {
-                if (!BN_generate_dsa_nonce(k, order, priv_key,
-                                           dgst, dlen, ctx)) {
+                if (!ossl_bn_gen_dsa_nonce_fixed_top(k, order, priv_key,
+                                                     dgst, dlen, ctx)) {
                     ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
                     goto err;
                 }
             } else {
-                if (!BN_priv_rand_range_ex(k, order, 0, ctx)) {
+                if (!ossl_bn_priv_rand_range_fixed_top(k, order, 0, ctx)) {
                     ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
                     goto err;
                 }
             }
-        } while (BN_is_zero(k));
+        } while (ossl_bn_is_word_fixed_top(k, 0));
 
         /* compute r the x-coordinate of generator * k */
@@ -251 +260 @@
     }
 
-    order = EC_GROUP_get0_order(group);
+    if ((order = EC_GROUP_get0_order(group)) == NULL) {
+        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+        goto err;
+    }
+
     i = BN_num_bits(order);
     /*

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677