Merge remote-tracking branch 'ms/wifi-fixes'

diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index df6bbe320d87d82b39ad14de14558d8a19662055..9896702620fb2e49b9ff62104140aa57117eb780 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -869,6 +869,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/DH_check_pub_key_ex.html
 #usr/share/doc/openssl/html/man3/DH_clear_flags.html
 #usr/share/doc/openssl/html/man3/DH_compute_key.html
+#usr/share/doc/openssl/html/man3/DH_compute_key_padded.html
 #usr/share/doc/openssl/html/man3/DH_free.html
 #usr/share/doc/openssl/html/man3/DH_generate_key.html
 #usr/share/doc/openssl/html/man3/DH_generate_parameters.html
@@ -1983,6 +1984,7 @@ usr/lib/libssl.so.1.1
 #usr/share/doc/openssl/html/man3/OCSP_REQUEST_new.html
 #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_add1_header.html
 #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_free.html
+#usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_i2d.html
 #usr/share/doc/openssl/html/man3/OCSP_REQ_CTX_set1_req.html
 #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_free.html
 #usr/share/doc/openssl/html/man3/OCSP_RESPBYTES_new.html
@@ -4838,6 +4840,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/DH_check_pub_key_ex.3
 #usr/share/man/man3/DH_clear_flags.3
 #usr/share/man/man3/DH_compute_key.3
+#usr/share/man/man3/DH_compute_key_padded.3
 #usr/share/man/man3/DH_free.3
 #usr/share/man/man3/DH_generate_key.3
 #usr/share/man/man3/DH_generate_parameters.3
@@ -5952,6 +5955,7 @@ usr/lib/libssl.so.1.1
 #usr/share/man/man3/OCSP_REQUEST_new.3
 #usr/share/man/man3/OCSP_REQ_CTX_add1_header.3
 #usr/share/man/man3/OCSP_REQ_CTX_free.3
+#usr/share/man/man3/OCSP_REQ_CTX_i2d.3
 #usr/share/man/man3/OCSP_REQ_CTX_set1_req.3
 #usr/share/man/man3/OCSP_RESPBYTES_free.3
 #usr/share/man/man3/OCSP_RESPBYTES_new.3

diff --git a/config/rootfiles/core/154/filelists/i586/openssl-sse2 b/config/rootfiles/core/154/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file

diff --git a/config/rootfiles/core/154/filelists/openssl b/config/rootfiles/core/154/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/lfs/openssl b/lfs/openssl
index 16e20b4391b3f53c40d7d0cdd4a9237bc9d68491..ea7eff1350da54d2c5e20cee83bfdecc855baee8 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.1i
+VER        = 1.1.1j
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 08987c3cf125202e2b0840035efb392c
+$(DL_FILE)_MD5 = cccaa064ed860a2b4d1303811bf5c682
 
 install : $(TARGET)