Changeset 105949 in vbox for trunk/src/libs/openssl-3.1.7/crypto/conf

Timestamp:

Sep 4, 2024 12:53:14 PM (7 months ago)

Author:

vboxsync

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

164683

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/crypto/conf

Files:

• conf_def.c (modified) (2 diffs)
• conf_lib.c (modified) (2 diffs)
• conf_sap.c (modified) (2 diffs)

trunk/src/libs/openssl-3.1.7/crypto/conf/conf_def.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -333 +333 @@
         v = NULL;
         /* check for line continuation */
-        if (!again && bufnum >= 1) {
+        if (bufnum >= 1) {
             /*
              * If we have bytes and the last char '\\' and second last char

trunk/src/libs/openssl-3.1.7/crypto/conf/conf_lib.c

@@ -1 +1 @@
 /*
- * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -465 +465 @@
 void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings)
 {
-    if (settings == NULL)
-        return;
-
     free(settings->filename);
     free(settings->appname);

trunk/src/libs/openssl-3.1.7/crypto/conf/conf_sap.c

@@ -1 +1 @@
 /*
- * Copyright 2002-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -39 +39 @@
     settings.flags = DEFAULT_CONF_MFLAGS;
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);
-
-    free(settings.appname);
 }
 #endif