Changeset 95219 in vbox for trunk/src/libs/openssl-3.0.3/crypto/evp/ctrl_params_translate.c

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)
• crypto/evp/ctrl_params_translate.c (modified) (5 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/crypto/evp/ctrl_params_translate.c

@@ -37 +37 @@
 #include "crypto/dh.h"
 #include "crypto/ec.h"
-
-#include "e_os.h"                /* strcasecmp() for Windows */
 
 struct translation_ctx_st;       /* Forwarding */
@@ -906 +904 @@
         /* Convert KDF type strings to numbers */
         for (; kdf_type_map->kdf_type_str != NULL; kdf_type_map++)
-            if (strcasecmp(ctx->p2, kdf_type_map->kdf_type_str) == 0) {
+            if (OPENSSL_strcasecmp(ctx->p2, kdf_type_map->kdf_type_str) == 0) {
                 ctx->p1 = kdf_type_map->kdf_type_num;
                 ret = 1;
@@ -1075 +1073 @@
 
     if (state == PRE_CTRL_STR_TO_PARAMS) {
-        ctx->p2 = (char *)ossl_dh_gen_type_id2name(atoi(ctx->p2));
+        if ((ctx->p2 = (char *)ossl_dh_gen_type_id2name(atoi(ctx->p2)))
+             == NULL) {
+            ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
+            return 0;
+        }
         ctx->p1 = strlen(ctx->p2);
     }
@@ -2470 +2472 @@
              */
             if (item->ctrl_str != NULL
-                && strcasecmp(tmpl->ctrl_str, item->ctrl_str) == 0)
+                && OPENSSL_strcasecmp(tmpl->ctrl_str, item->ctrl_str) == 0)
                 ctrl_str = tmpl->ctrl_str;
             else if (item->ctrl_hexstr != NULL
-                     && strcasecmp(tmpl->ctrl_hexstr, item->ctrl_hexstr) == 0)
+                     && OPENSSL_strcasecmp(tmpl->ctrl_hexstr,
+                                           item->ctrl_hexstr) == 0)
                 ctrl_hexstr = tmpl->ctrl_hexstr;
             else
@@ -2501 +2504 @@
                  && tmpl->action_type != item->action_type)
                 || (item->param_key != NULL
-                    && strcasecmp(tmpl->param_key, item->param_key) != 0))
+                    && OPENSSL_strcasecmp(tmpl->param_key,
+                                          item->param_key) != 0))
                 continue;
         } else {

@@ -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