Changeset 95219 in vbox for trunk/src/libs/openssl-3.0.3/apps/lib

Timestamp:

Jun 8, 2022 7:43:44 AM (3 years ago)

Author:

vboxsync

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

151730

Message:

libs/openssl: Switched to v3.0.3, bugref:10128

Location:

trunk/src/libs/openssl-3.0.3

Files:

• . (modified) (1 prop)
• apps/lib/apps.c (modified) (4 diffs)
• apps/lib/engine_loader.c (modified) (1 diff)
• apps/lib/http_server.c (modified) (2 diffs)
• apps/lib/names.c (modified) (2 diffs)
• apps/lib/vms_term_sock.c (modified) (2 diffs)

trunk/src/libs/openssl-3.0.3

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496

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

@@ -689 +689 @@
     char *pass_string;
 
-    if (exclude_http && (strncasecmp(uri, "http://", 7) == 0
-                         || strncasecmp(uri, "https://", 8) == 0)) {
+    if (exclude_http && (OPENSSL_strncasecmp(uri, "http://", 7) == 0
+                         || OPENSSL_strncasecmp(uri, "https://", 8) == 0)) {
         BIO_printf(bio_err, "error: HTTP retrieval not allowed for %s\n", desc);
         return ret;
@@ -1183 +1183 @@
 int set_dateopt(unsigned long *dateopt, const char *arg)
 {
-    if (strcasecmp(arg, "rfc_822") == 0)
+    if (OPENSSL_strcasecmp(arg, "rfc_822") == 0)
         *dateopt = ASN1_DTFLGS_RFC822;
-    else if (strcasecmp(arg, "iso_8601") == 0)
+    else if (OPENSSL_strcasecmp(arg, "iso_8601") == 0)
         *dateopt = ASN1_DTFLGS_ISO8601;
     return 0;
@@ -1192 +1192 @@
 int set_ext_copy(int *copy_type, const char *arg)
 {
-    if (strcasecmp(arg, "none") == 0)
+    if (OPENSSL_strcasecmp(arg, "none") == 0)
         *copy_type = EXT_COPY_NONE;
-    else if (strcasecmp(arg, "copy") == 0)
+    else if (OPENSSL_strcasecmp(arg, "copy") == 0)
         *copy_type = EXT_COPY_ADD;
-    else if (strcasecmp(arg, "copyall") == 0)
+    else if (OPENSSL_strcasecmp(arg, "copyall") == 0)
         *copy_type = EXT_COPY_ALL;
     else
@@ -1276 +1276 @@
 
     for (ptbl = in_tbl; ptbl->name; ptbl++) {
-        if (strcasecmp(arg, ptbl->name) == 0) {
+        if (OPENSSL_strcasecmp(arg, ptbl->name) == 0) {
             *flags &= ~ptbl->mask;
             if (c)

trunk/src/libs/openssl-3.0.3/apps/lib/engine_loader.c

@@ -72 +72 @@
     OSSL_STORE_LOADER_CTX *ctx = NULL;
 
-    if (strncasecmp(p, ENGINE_SCHEME_COLON, sizeof(ENGINE_SCHEME_COLON) - 1)
+    if (OPENSSL_strncasecmp(p, ENGINE_SCHEME_COLON, sizeof(ENGINE_SCHEME_COLON) - 1)
         != 0)
         return NULL;

trunk/src/libs/openssl-3.0.3/apps/lib/http_server.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -454 +454 @@
         *line_end = '\0';
         /* https://tools.ietf.org/html/rfc7230#section-6.3 Persistence */
-        if (found_keep_alive != NULL && strcasecmp(key, "Connection") == 0) {
-            if (strcasecmp(value, "keep-alive") == 0)
+        if (found_keep_alive != NULL
+            && OPENSSL_strcasecmp(key, "Connection") == 0) {
+            if (OPENSSL_strcasecmp(value, "keep-alive") == 0)
                 *found_keep_alive = 1;
-            else if (strcasecmp(value, "close") == 0)
+            else if (OPENSSL_strcasecmp(value, "close") == 0)
                 *found_keep_alive = 0;
         }

trunk/src/libs/openssl-3.0.3/apps/lib/names.c

@@ -1 +1 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -12 +12 @@
 #include <openssl/safestack.h>
 #include "names.h"
-
-#ifdef _WIN32
-# define strcasecmp _stricmp
-#endif
+#include "openssl/crypto.h"
 
 int name_cmp(const char * const *a, const char * const *b)
 {
-    return strcasecmp(*a, *b);
+    return OPENSSL_strcasecmp(*a, *b);
 }
 

trunk/src/libs/openssl-3.0.3/apps/lib/vms_term_sock.c

@@ -1 +1 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2016 VMS Software, Inc. All Rights Reserved.
  *
@@ -134 +134 @@
 
     LogMessage ("Enter 'q' or 'Q' to quit ...");
-    while (strcasecmp (TermBuff, "Q")) {
+    while (OPENSSL_strcasecmp (TermBuff, "Q")) {
         /*
         ** Create the terminal socket

@@ -14 +14 @@
 /vendor/openssl/3.0.1:150323-150324
 /vendor/openssl/3.0.2:150728-150729
-/vendor/openssl/current:147554-150727
+/vendor/openssl/3.0.3:151497-151729
+/vendor/openssl/current:147554-151496