Changeset 97372 in vbox for trunk/src/libs/openssl-3.0.7/apps/lib/apps.c

Timestamp:

Nov 2, 2022 7:40:16 AM (2 years ago)

Author:

vboxsync

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

154372

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

• . (modified) (1 prop)
• apps/lib/apps.c (modified) (11 diffs)

trunk/src/libs/openssl-3.0.7

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370

trunk/src/libs/openssl-3.0.7/apps/lib/apps.c

@@ -1187 +1187 @@
     else if (OPENSSL_strcasecmp(arg, "iso_8601") == 0)
         *dateopt = ASN1_DTFLGS_ISO8601;
-    return 0;
+    else
+        return 0;
+    return 1;
 }
 
@@ -1370 +1372 @@
             goto end;
         if (CAfile != NULL) {
-            if (!X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
-                                          libctx, propq)) {
+            if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
+                                          libctx, propq) <= 0) {
                 BIO_printf(bio_err, "Error loading file %s\n", CAfile);
                 goto end;
@@ -1386 +1388 @@
             goto end;
         if (CApath != NULL) {
-            if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM)) {
+            if (X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM) <= 0) {
                 BIO_printf(bio_err, "Error loading directory %s\n", CApath);
                 goto end;
@@ -1455 +1457 @@
 #undef BSIZE
 #define BSIZE 256
-BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai)
+BIGNUM *load_serial(const char *serialfile, int *exists, int create,
+                    ASN1_INTEGER **retai)
 {
     BIO *in = NULL;
@@ -1467 +1470 @@
 
     in = BIO_new_file(serialfile, "r");
+    if (exists != NULL)
+        *exists = in != NULL;
     if (in == NULL) {
         if (!create) {
@@ -1474 +1479 @@
         ERR_clear_error();
         ret = BN_new();
-        if (ret == NULL || !rand_serial(ret, ai))
+        if (ret == NULL) {
             BIO_printf(bio_err, "Out of memory\n");
+        } else if (!rand_serial(ret, ai)) {
+            BIO_printf(bio_err, "Error creating random number to store in %s\n",
+                       serialfile);
+            BN_free(ret);
+            ret = NULL;
+        }
     } else {
         if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
@@ -1489 +1500 @@
     }
 
-    if (ret && retai) {
+    if (ret != NULL && retai != NULL) {
         *retai = ai;
         ai = NULL;
     }
  err:
-    ERR_print_errors(bio_err);
+    if (ret == NULL)
+        ERR_print_errors(bio_err);
     BIO_free(in);
     ASN1_INTEGER_free(ai);
@@ -2457 +2469 @@
     SSL_CTX *ssl_ctx = info->ssl_ctx;
 
-    if (connect && detail) { /* connecting with TLS */
+    if (ssl_ctx == NULL) /* not using TLS */
+        return bio;
+    if (connect) {
         SSL *ssl;
         BIO *sbio = NULL;
@@ -2535 +2549 @@
         ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER,
                        "missing SSL_CTX");
+        goto end;
+    }
+    if (!use_ssl && ssl_ctx != NULL) {
+        ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_INVALID_ARGUMENT,
+                       "SSL_CTX given but use_ssl == 0");
         goto end;
     }
@@ -2918 +2937 @@
     void *prefix = NULL;
 
+    if (b == NULL)
+        return NULL;
+
 #ifdef OPENSSL_SYS_VMS
     if (FMT_istext(format))
@@ -2937 +2959 @@
                         BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
 #ifdef OPENSSL_SYS_VMS
-    if (FMT_istext(format))
+    if (b != NULL && FMT_istext(format))
         b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
 #endif

@@ -15 +15 @@
 /vendor/openssl/3.0.2:150728-150729
 /vendor/openssl/3.0.3:151497-151729
-/vendor/openssl/current:147554-151496
+/vendor/openssl/3.0.7:154371
+/vendor/openssl/current:147554-154370