openssl: update to 3.5.7

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/2282>

3 files changed, 16 insertions, 15 deletions

diff --git a/recipes/openssl.recipe b/recipes/openssl.recipe
index 69536a2e..04db8ba5 100644
--- a/recipes/openssl.recipe
+++ b/recipes/openssl.recipe
@@ -11,11 +11,11 @@ class Recipe(recipe.Recipe):
     # Note: openssl helpfully moves tarballs somewhere else (old/x.y.z/)
     # whenever a new release comes out, so make sure to mirror to fdo when
     # bumping the release!
-    version = '3.5.0'
+    version = '3.5.7'
     licenses = [License.Apachev2]
     stype = SourceType.TARBALL
     url = 'https://github.com/openssl/openssl/releases/download/openssl-%(version)s/openssl-%(version)s.tar.gz'
-    tarball_checksum = '344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0'
+    tarball_checksum = 'a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8'
     deps = ['ca-certificates', 'zlib']
     # Configure script is perl, not shell
     config_sh_needs_shell = False
diff --git a/recipes/openssl/0001-Load-ca-certificate.crt-from-PREFIX-etc-ssl-on-macOS.patch b/recipes/openssl/0001-Load-ca-certificate.crt-from-PREFIX-etc-ssl-on-macOS.patch
index e37dd612..41f217bf 100644
--- a/recipes/openssl/0001-Load-ca-certificate.crt-from-PREFIX-etc-ssl-on-macOS.patch
+++ b/recipes/openssl/0001-Load-ca-certificate.crt-from-PREFIX-etc-ssl-on-macOS.patch
@@ -17,7 +17,7 @@ index 96198a9397..68b5c78374 100644
 +++ b/crypto/dllmain.c
 @@ -20,6 +20,36 @@
   */
- # endif
+ #endif
  
 +HMODULE __priv_crypto_dll_handle = NULL;
 +
@@ -119,9 +119,9 @@ index cd5b75d3a9..f91c0d3398 100644
 +#endif
 +
  static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                         long argl, char **ret);
+     long argl, char **ret);
  static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc,
-@@ -54,10 +104,15 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
+@@ -53,11 +103,16 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
      switch (cmd) {
      case X509_L_FILE_LOAD:
          if (argl == X509_FILETYPE_DEFAULT) {
@@ -130,14 +130,15 @@ index cd5b75d3a9..f91c0d3398 100644
 +            portable_file = _get_portable_X509_cert_file();
              if (file)
                  ok = (X509_load_cert_crl_file_ex(ctx, file, X509_FILETYPE_PEM,
-                                                  libctx, propq) != 0);
+                           libctx, propq)
+                     != 0);
 +            else if (portable_file)
 +                ok = (X509_load_cert_crl_file_ex(ctx, portable_file, X509_FILETYPE_PEM,
 +                                                 libctx, propq) != 0);
              else
                  ok = (X509_load_cert_crl_file_ex(
-                          ctx, X509_get_default_cert_file(),
-@@ -65,6 +120,7 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
+                           ctx, X509_get_default_cert_file(),
+@@ -66,6 +121,7 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
  
              if (!ok)
                  ERR_raise(ERR_LIB_X509, X509_R_LOADING_DEFAULTS);
@@ -146,5 +147,5 @@ index cd5b75d3a9..f91c0d3398 100644
              if (argl == X509_FILETYPE_PEM)
                  ok = (X509_load_cert_crl_file_ex(ctx, argp, X509_FILETYPE_PEM,
 -- 
-2.46.0
+2.53.0.windows.3
 
diff --git a/recipes/openssl/0002-windows-makefile.tmpl-Generate-and-install-pkgconfig.patch b/recipes/openssl/0002-windows-makefile.tmpl-Generate-and-install-pkgconfig.patch
index be460764..6d2c6c92 100644
--- a/recipes/openssl/0002-windows-makefile.tmpl-Generate-and-install-pkgconfig.patch
+++ b/recipes/openssl/0002-windows-makefile.tmpl-Generate-and-install-pkgconfig.patch
@@ -13,7 +13,7 @@ diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makef
 index 894834cfb7..51ad2e9b5b 100644
 --- a/Configurations/windows-makefile.tmpl
 +++ b/Configurations/windows-makefile.tmpl
-@@ -424,7 +424,7 @@ build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7)
+@@ -425,7 +425,7 @@ build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7)
  	@
  build_generated: $(GENERATED_MANDATORY)
  	@
@@ -22,15 +22,15 @@ index 894834cfb7..51ad2e9b5b 100644
  	@
  build_modules_nodep: $(MODULES)
  	@
-@@ -484,6 +484,7 @@ clean: libclean
+@@ -485,6 +485,7 @@ clean: libclean
  	-del /Q /S /F engines\*.lib engines\*.exp
  	-del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp
  	-del /Q /S /F test\*.exp
 +	-del /Q /S /F openssl.pc libcrypto.pc libssl.pc
- 	-rd /Q /S test\test-runs
+ 	-@if exist "$(RESULT_D)" rd /Q /S "$(RESULT_D)"
  
  distclean: clean
-@@ -566,6 +567,14 @@ install_dev: install_runtime_libs
+@@ -567,6 +568,14 @@ install_dev: install_runtime_libs
  	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) "$(libdir)"
  	@if "$(SHLIBS)"=="" \
  	 "$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb "$(libdir)"
@@ -45,7 +45,7 @@ index 894834cfb7..51ad2e9b5b 100644
  	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(CMAKECONFIGDIR)"
  	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_EXPORTERS_CMAKE) "$(CMAKECONFIGDIR)"
  
-@@ -660,6 +669,45 @@ $(BLDDIR)\apps\openssl.cnf: makefile
+@@ -661,6 +670,45 @@ $(BLDDIR)\apps\openssl.cnf: makefile
  	@if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\apps\$(@F)" "$(BLDDIR)\apps"
  
  # Building targets ###################################################
@@ -92,5 +92,5 @@ index 894834cfb7..51ad2e9b5b 100644
  makefile: configdata.pm {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}) -}
  	@$(ECHO) "Detected changed: $?"
 -- 
-2.46.0
+2.53.0.windows.3