Changeset 97372 in vbox for trunk/src/libs/openssl-3.0.7/crypto/cmp/cmp_msg.c

Timestamp:

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

Author:

vboxsync

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

• . (modified) (1 prop)
• crypto/cmp/cmp_msg.c (modified) (2 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/crypto/cmp/cmp_msg.c

@@ -254 +254 @@
          || OSSL_CMP_CTX_reqExtensions_have_SAN(ctx) == 1)
 
-static const X509_NAME *determine_subj(OSSL_CMP_CTX *ctx,
-                                       const X509_NAME *ref_subj,
-                                       int for_KUR)
+static const X509_NAME *determine_subj(OSSL_CMP_CTX *ctx, int for_KUR,
+                                       const X509_NAME *ref_subj)
 {
     if (ctx->subjectName != NULL)
         return IS_NULL_DN(ctx->subjectName) ? NULL : ctx->subjectName;
-
-    if (ref_subj != NULL && (ctx->p10CSR != NULL || for_KUR || !HAS_SAN(ctx)))
+    if (ctx->p10CSR != NULL) /* first default is from any given CSR */
+        return X509_REQ_get_subject_name(ctx->p10CSR);
+    if (for_KUR || !HAS_SAN(ctx))
         /*
-         * For KUR, copy subject from the reference.
+         * For KUR, copy subject from any reference cert as fallback.
          * For IR or CR, do the same only if there is no subjectAltName.
          */
@@ -278 +278 @@
     STACK_OF(GENERAL_NAME) *default_sans = NULL;
     const X509_NAME *ref_subj =
-        ctx->p10CSR != NULL ? X509_REQ_get_subject_name(ctx->p10CSR) :
         refcert != NULL ? X509_get_subject_name(refcert) : NULL;
-    const X509_NAME *subject = determine_subj(ctx, ref_subj, for_KUR);
+    const X509_NAME *subject = determine_subj(ctx, for_KUR, ref_subj);
     const X509_NAME *issuer = ctx->issuer != NULL || refcert == NULL
         ? (IS_NULL_DN(ctx->issuer) ? NULL : ctx->issuer)

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