Upgrade openssl to 3.3.7

Author: jykanase

SPECS/openssl/0001-Add-NULL-check-to-PKCS12_item_decrypt_d2i_ex.patch

@@ -21,64 +21,64 @@ automatically negotiate the highest supported protocol.
 For SSLv3 methods we're returning a NULL pointer as there are no
 more supported methods for the SSL protocol.
 ---
- ssl/methods.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
+ ssl/methods.c | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
 
 diff --git a/ssl/methods.c b/ssl/methods.c
-index c846143277..a7ae074bfd 100644
+index 0117254..0709883 100644
 --- a/ssl/methods.c
 +++ b/ssl/methods.c
-@@ -215,17 +215,29 @@ const SSL_METHOD *TLSv1_client_method(void)
- # ifndef OPENSSL_NO_SSL3_METHOD
+@@ -228,29 +228,17 @@ const SSL_METHOD *TLSv1_client_method(void)
+ #ifndef OPENSSL_NO_SSL3_METHOD
  const SSL_METHOD *SSLv3_method(void)
  {
-+#  ifdef OPENSSL_NO_SSL3
-+    return NULL;
-+#  else
+-#  ifdef OPENSSL_NO_SSL3
+-    return NULL;
+-#  else
      return sslv3_method();
-+#  endif
+-#endif
  }
 
  const SSL_METHOD *SSLv3_server_method(void)
  {
-+#  ifdef OPENSSL_NO_SSL3
-+    return NULL;
-+#  else
+-#  ifdef OPENSSL_NO_SSL3
+-    return NULL;
+-#  else
      return sslv3_server_method();
-+#  endif
+-#endif
  }
 
  const SSL_METHOD *SSLv3_client_method(void)
  {
-+#  ifdef OPENSSL_NO_SSL3
-+    return NULL;
-+#  else
+-#  ifdef OPENSSL_NO_SSL3
+-    return NULL;
+-#  else
      return sslv3_client_method();
-+#  endif
+-#endif
  }
- # endif
+ #endif
 
-@@ -249,17 +261,17 @@ const SSL_METHOD *DTLSv1_2_client_method(void)
- # ifndef OPENSSL_NO_DTLS1_METHOD
+@@ -274,17 +262,17 @@ const SSL_METHOD *DTLSv1_2_client_method(void)
+ #ifndef OPENSSL_NO_DTLS1_METHOD
  const SSL_METHOD *DTLSv1_method(void)
  {
--    return dtlsv1_method();
-+    return DTLS_method();
+-    return DTLS_method();
++    return dtlsv1_method();
  }
 
  const SSL_METHOD *DTLSv1_server_method(void)
  {
--    return dtlsv1_server_method();
-+    return DTLS_server_method();
+-    return DTLS_server_method();
++    return dtlsv1_server_method();
  }
 
  const SSL_METHOD *DTLSv1_client_method(void)
  {
--    return dtlsv1_client_method();
-+    return DTLS_client_method();
+-    return DTLS_server_method();
++    return dtlsv1_client_method();
  }
- # endif
+ #endif
 
 -- 
-2.25.1
+2.45.4