OpenSSL: Update to 1.1.1m

Message ID 3a7ded2d-e844-5441-39c1-f04804ecbbc5@ipfire.org
State Accepted
Commit cab30542883d3842d64ec14923c11e12749d87c6
Headers
Series OpenSSL: Update to 1.1.1m |

Commit Message

Peter Müller Jan. 30, 2022, 5:03 p.m. UTC
  Full changelog as per https://www.openssl.org/news/cl111.txt :

 Changes between 1.1.1l and 1.1.1m [14 Dec 2021]

  *) Avoid loading of a dynamic engine twice.

     [Bernd Edlinger]

  *) Fixed building on Debian with kfreebsd kernels

     [Mattias Ellert]

  *) Prioritise DANE TLSA issuer certs over peer certs

     [Viktor Dukhovni]

  *) Fixed random API for MacOS prior to 10.12

     These MacOS versions don't support the CommonCrypto APIs

     [Lenny Primak]

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/common/openssl | 8 ++++++++
 lfs/openssl                     | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
  

Comments

Michael Tremer Jan. 31, 2022, 8:47 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 30 Jan 2022, at 17:03, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Full changelog as per https://www.openssl.org/news/cl111.txt :
> 
> Changes between 1.1.1l and 1.1.1m [14 Dec 2021]
> 
>  *) Avoid loading of a dynamic engine twice.
> 
>     [Bernd Edlinger]
> 
>  *) Fixed building on Debian with kfreebsd kernels
> 
>     [Mattias Ellert]
> 
>  *) Prioritise DANE TLSA issuer certs over peer certs
> 
>     [Viktor Dukhovni]
> 
>  *) Fixed random API for MacOS prior to 10.12
> 
>     These MacOS versions don't support the CommonCrypto APIs
> 
>     [Lenny Primak]
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/rootfiles/common/openssl | 8 ++++++++
> lfs/openssl                     | 6 +++---
> 2 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
> index 345f487d7..d690f5be0 100644
> --- a/config/rootfiles/common/openssl
> +++ b/config/rootfiles/common/openssl
> @@ -3846,6 +3846,8 @@ usr/lib/libssl.so.1.1
> #usr/share/doc/openssl/html/man3/d2i_X509_REVOKED.html
> #usr/share/doc/openssl/html/man3/d2i_X509_SIG.html
> #usr/share/doc/openssl/html/man3/d2i_X509_VAL.html
> +#usr/share/doc/openssl/html/man3/d2i_X509_bio.html
> +#usr/share/doc/openssl/html/man3/d2i_X509_fp.html
> #usr/share/doc/openssl/html/man3/i2d_ACCESS_DESCRIPTION.html
> #usr/share/doc/openssl/html/man3/i2d_ADMISSIONS.html
> #usr/share/doc/openssl/html/man3/i2d_ADMISSION_SYNTAX.html
> @@ -4040,6 +4042,8 @@ usr/lib/libssl.so.1.1
> #usr/share/doc/openssl/html/man3/i2d_X509_REVOKED.html
> #usr/share/doc/openssl/html/man3/i2d_X509_SIG.html
> #usr/share/doc/openssl/html/man3/i2d_X509_VAL.html
> +#usr/share/doc/openssl/html/man3/i2d_X509_bio.html
> +#usr/share/doc/openssl/html/man3/i2d_X509_fp.html
> #usr/share/doc/openssl/html/man3/i2d_re_X509_CRL_tbs.html
> #usr/share/doc/openssl/html/man3/i2d_re_X509_REQ_tbs.html
> #usr/share/doc/openssl/html/man3/i2d_re_X509_tbs.html
> @@ -7819,6 +7823,8 @@ usr/lib/libssl.so.1.1
> #usr/share/man/man3/d2i_X509_REVOKED.3
> #usr/share/man/man3/d2i_X509_SIG.3
> #usr/share/man/man3/d2i_X509_VAL.3
> +#usr/share/man/man3/d2i_X509_bio.3
> +#usr/share/man/man3/d2i_X509_fp.3
> #usr/share/man/man3/i2d_ACCESS_DESCRIPTION.3
> #usr/share/man/man3/i2d_ADMISSIONS.3
> #usr/share/man/man3/i2d_ADMISSION_SYNTAX.3
> @@ -8013,6 +8019,8 @@ usr/lib/libssl.so.1.1
> #usr/share/man/man3/i2d_X509_REVOKED.3
> #usr/share/man/man3/i2d_X509_SIG.3
> #usr/share/man/man3/i2d_X509_VAL.3
> +#usr/share/man/man3/i2d_X509_bio.3
> +#usr/share/man/man3/i2d_X509_fp.3
> #usr/share/man/man3/i2d_re_X509_CRL_tbs.3
> #usr/share/man/man3/i2d_re_X509_REQ_tbs.3
> #usr/share/man/man3/i2d_re_X509_tbs.3
> diff --git a/lfs/openssl b/lfs/openssl
> index 6af904252..ababd7635 100644
> --- a/lfs/openssl
> +++ b/lfs/openssl
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 1.1.1l
> +VER        = 1.1.1m
> 
> THISAPP    = openssl-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -74,7 +74,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = ac0d4387f3ba0ad741b0580dd45f6ff3
> +$(DL_FILE)_MD5 = 8ec70f665c145c3103f6e330f538a9db
> 
> install : $(TARGET)
> 
> -- 
> 2.31.1
  

Patch

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index 345f487d7..d690f5be0 100644
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -3846,6 +3846,8 @@  usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/d2i_X509_REVOKED.html
 #usr/share/doc/openssl/html/man3/d2i_X509_SIG.html
 #usr/share/doc/openssl/html/man3/d2i_X509_VAL.html
+#usr/share/doc/openssl/html/man3/d2i_X509_bio.html
+#usr/share/doc/openssl/html/man3/d2i_X509_fp.html
 #usr/share/doc/openssl/html/man3/i2d_ACCESS_DESCRIPTION.html
 #usr/share/doc/openssl/html/man3/i2d_ADMISSIONS.html
 #usr/share/doc/openssl/html/man3/i2d_ADMISSION_SYNTAX.html
@@ -4040,6 +4042,8 @@  usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/i2d_X509_REVOKED.html
 #usr/share/doc/openssl/html/man3/i2d_X509_SIG.html
 #usr/share/doc/openssl/html/man3/i2d_X509_VAL.html
+#usr/share/doc/openssl/html/man3/i2d_X509_bio.html
+#usr/share/doc/openssl/html/man3/i2d_X509_fp.html
 #usr/share/doc/openssl/html/man3/i2d_re_X509_CRL_tbs.html
 #usr/share/doc/openssl/html/man3/i2d_re_X509_REQ_tbs.html
 #usr/share/doc/openssl/html/man3/i2d_re_X509_tbs.html
@@ -7819,6 +7823,8 @@  usr/lib/libssl.so.1.1
 #usr/share/man/man3/d2i_X509_REVOKED.3
 #usr/share/man/man3/d2i_X509_SIG.3
 #usr/share/man/man3/d2i_X509_VAL.3
+#usr/share/man/man3/d2i_X509_bio.3
+#usr/share/man/man3/d2i_X509_fp.3
 #usr/share/man/man3/i2d_ACCESS_DESCRIPTION.3
 #usr/share/man/man3/i2d_ADMISSIONS.3
 #usr/share/man/man3/i2d_ADMISSION_SYNTAX.3
@@ -8013,6 +8019,8 @@  usr/lib/libssl.so.1.1
 #usr/share/man/man3/i2d_X509_REVOKED.3
 #usr/share/man/man3/i2d_X509_SIG.3
 #usr/share/man/man3/i2d_X509_VAL.3
+#usr/share/man/man3/i2d_X509_bio.3
+#usr/share/man/man3/i2d_X509_fp.3
 #usr/share/man/man3/i2d_re_X509_CRL_tbs.3
 #usr/share/man/man3/i2d_re_X509_REQ_tbs.3
 #usr/share/man/man3/i2d_re_X509_tbs.3
diff --git a/lfs/openssl b/lfs/openssl
index 6af904252..ababd7635 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 1.1.1l
+VER        = 1.1.1m
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -74,7 +74,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ac0d4387f3ba0ad741b0580dd45f6ff3
+$(DL_FILE)_MD5 = 8ec70f665c145c3103f6e330f538a9db
 
 install : $(TARGET)