Release version 1.1.1+12v1.1.1+12

Upgrade to 1.1.1i

Add symlink attribute for symbolic links that refer to upstream subdirectories

Make the .map and .def files prerequisites of the libs type target

Canonicalize the license in the package manifests

Load the c.config module rather than c in openssl/tests/build/root.build

8 files changed, 243 insertions, 78 deletions

diff --git a/upstream-build/configdata.pm/i686-linux b/upstream-build/configdata.pm/i686-linux
index d67aff2..c0b6a4f 100644
--- a/upstream-build/configdata.pm/i686-linux
+++ b/upstream-build/configdata.pm/i686-linux
@@ -60,11 +60,11 @@ our %config = (
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "i386-linux-thread-multi",
   perl_cmd => "/usr/bin/perl",
   perl_version => "5.24.3",
-  perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => "..",
   target => "linux-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -150,7 +150,7 @@ our %target = (
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
   cxxflags => "-std=c++11 -pthread -m32",
-  defines => [  ],
+  defines => [ "ZLIB" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -159,7 +159,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [ "afalgeng" ],
-  ex_libs => "-ldl -pthread",
+  ex_libs => "-lz -ldl -pthread",
   exe_extension => "",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -338,7 +338,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1212,6 +1211,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3204,8 +3208,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3235,6 +3237,8 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10733,6 +10737,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11458,6 +11469,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16213,6 +16225,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/i686-win32-mingw32 b/upstream-build/configdata.pm/i686-win32-mingw32
index 9e36aa2..9c8ae3d 100644
--- a/upstream-build/configdata.pm/i686-win32-mingw32
+++ b/upstream-build/configdata.pm/i686-win32-mingw32
@@ -59,11 +59,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_MINGW32" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
-  perl_archname => "i686-msys-thread-multi-64int",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
+  perl_archname => "x86_64-msys-thread-multi",
   perl_cmd => "/usr/bin/perl",
-  perl_version => "5.30.0",
-  perlargv => [ "mingw", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perl_version => "5.32.0",
+  perlargv => [ "mingw", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => "..",
   target => "mingw",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -146,7 +146,7 @@ our %target = (
   cppflags => "-DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN -D_MT",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [ "OPENSSL_USE_APPLINK" ],
+  defines => [ "ZLIB", "OPENSSL_USE_APPLINK" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -155,7 +155,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
-  ex_libs => "-lws2_32 -lgdi32 -lcrypt32",
+  ex_libs => "-lz -lws2_32 -lgdi32 -lcrypt32",
   exe_extension => ".exe",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -339,7 +339,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1209,6 +1208,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3202,9 +3206,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ms/uplink.o",
                             "ms/applink.o",
                             "ms/applink.o",
-                            "ms/uplink.o",
                         ],
                     "products" =>
                         {
@@ -3223,8 +3227,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3254,6 +3256,8 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10798,6 +10802,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11522,6 +11533,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16309,6 +16321,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc
index 8dc820f..28d45fb 100644
--- a/upstream-build/configdata.pm/i686-win32-msvc
+++ b/upstream-build/configdata.pm/i686-win32-msvc
@@ -63,11 +63,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib --with-zlib-lib=c:\\zlib32\\lib\\z.dll.lib --with-zlib-include=c:\\zlib32\\include no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "MSWin32-x64-multi-thread",
   perl_cmd => "C:\\Perl64\\bin\\perl.exe",
-  perl_version => "5.26.3",
-  perlargv => [ "VC-WIN32", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perl_version => "5.28.1",
+  perlargv => [ "VC-WIN32", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib", "--with-zlib-lib=c:\\zlib32\\lib\\z.dll.lib", "--with-zlib-include=c:\\zlib32\\include" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => "..",
   target => "VC-WIN32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -132,7 +132,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x65d9b8)",
+  RANLIB => "CODE(0xe44e20)",
   RC => "rc",
   _conf_fname_int => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -163,7 +163,7 @@ our %target = (
   cppflags => "",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [ "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS", "OPENSSL_USE_APPLINK" ],
+  defines => [ "ZLIB", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS", "OPENSSL_USE_APPLINK" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -173,9 +173,9 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
-  ex_libs => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib",
+  ex_libs => "c:\\zlib32\\lib\\z.dll.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib",
   exe_extension => "",
-  includes => [  ],
+  includes => [ "c:\\zlib32\\include" ],
   keccak1600_asm_src => "keccak1600.c",
   keccak1600_obj => "keccak1600.o",
   ldoutflag => "/out:",
@@ -356,11 +356,12 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
 our %withargs = (
+  zlib_include => "c:\\zlib32\\include",
+  zlib_lib => "c:\\zlib32\\lib\\z.dll.lib",
 );
 
 our %unified_info = (
@@ -1226,6 +1227,11 @@ our %unified_info = (
                     "libssl",
                     "test\\libtestutil.a",
                 ],
+            "test\\cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test\\libtestutil.a",
+                ],
             "test\\cmsapitest" =>
                 [
                     "libcrypto",
@@ -3218,9 +3224,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ms\\uplink.o",
                             "ms\\applink.o",
                             "ms\\applink.o",
+                            "ms\\uplink.o",
                         ],
                     "products" =>
                         {
@@ -3239,6 +3245,8 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ssl\\packet.o",
+                            "ssl\\tls13_enc.o",
                             "ssl\\bio_ssl.o",
                             "ssl\\d1_lib.o",
                             "ssl\\d1_msg.o",
@@ -3268,8 +3276,6 @@ our %unified_info = (
                             "ssl\\t1_trce.o",
                             "ssl\\tls13_enc.o",
                             "ssl\\tls_srp.o",
-                            "ssl\\packet.o",
-                            "ssl\\tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10016,12 +10022,12 @@ our %unified_info = (
                 ],
             "ms\\applink.o" =>
                 [
-                    "apps",
                     ".",
                     "include",
-                    "..\\apps",
+                    "apps",
                     "..",
                     "..\\include",
+                    "..\\apps",
                 ],
             "ms\\uplink.o" =>
                 [
@@ -10807,6 +10813,13 @@ our %unified_info = (
                     "include",
                     "..\\include",
                 ],
+            "test\\cmactest.o" =>
+                [
+                    "include",
+                    "apps\\include",
+                    "..\\include",
+                    "..\\apps\\include",
+                ],
             "test\\cmsapitest.o" =>
                 [
                     "include",
@@ -11531,6 +11544,7 @@ our %unified_info = (
             "test\\cipherlist_test",
             "test\\ciphername_test",
             "test\\clienthellotest",
+            "test\\cmactest",
             "test\\cmsapitest",
             "test\\conf_include_test",
             "test\\constant_time_test",
@@ -16281,6 +16295,14 @@ our %unified_info = (
                 [
                     "..\\test\\clienthellotest.c",
                 ],
+            "test\\cmactest" =>
+                [
+                    "test\\cmactest.o",
+                ],
+            "test\\cmactest.o" =>
+                [
+                    "..\\test\\cmactest.c",
+                ],
             "test\\cmsapitest" =>
                 [
                     "test\\cmsapitest.o",
diff --git a/upstream-build/configdata.pm/x86_64-freebsd b/upstream-build/configdata.pm/x86_64-freebsd
index a0c3d2c..33a5d1e 100644
--- a/upstream-build/configdata.pm/x86_64-freebsd
+++ b/upstream-build/configdata.pm/x86_64-freebsd
@@ -59,11 +59,11 @@ our %config = (
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "amd64-freebsd-thread-multi",
   perl_cmd => "/usr/local/bin/perl",
   perl_version => "5.30.0",
-  perlargv => [ "BSD-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perlargv => [ "BSD-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => "..",
   target => "BSD-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -146,7 +146,7 @@ our %target = (
   cppflags => "-D_THREAD_SAFE -D_REENTRANT",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [  ],
+  defines => [ "ZLIB" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -155,7 +155,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [ "devcryptoeng" ],
-  ex_libs => "-pthread",
+  ex_libs => "-lz -pthread",
   exe_extension => "",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -335,7 +335,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1205,6 +1204,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -10719,6 +10723,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11443,6 +11454,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16190,6 +16202,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux
index 012e628..bfc95f4 100644
--- a/upstream-build/configdata.pm/x86_64-linux
+++ b/upstream-build/configdata.pm/x86_64-linux
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => "..",
   target => "linux-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -1212,6 +1212,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3204,6 +3209,8 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3233,8 +3240,6 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10733,6 +10738,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11458,6 +11470,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16213,6 +16226,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos
index d1c84d5..6b5cf94 100644
--- a/upstream-build/configdata.pm/x86_64-macos
+++ b/upstream-build/configdata.pm/x86_64-macos
@@ -59,11 +59,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "darwin-thread-multi-2level",
   perl_cmd => "/usr/bin/perl",
   perl_version => "5.18.4",
-  perlargv => [ "darwin64-x86_64-cc", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perlargv => [ "darwin64-x86_64-cc", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => "..",
   target => "darwin64-x86_64-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -146,7 +146,7 @@ our %target = (
   cppflags => "-D_REENTRANT",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [  ],
+  defines => [ "ZLIB" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -155,6 +155,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
+  ex_libs => "-lz",
   exe_extension => "",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -334,7 +335,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1196,6 +1196,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3187,8 +3192,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3218,6 +3221,8 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10698,6 +10703,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11422,6 +11434,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16161,6 +16174,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/x86_64-win32-mingw32 b/upstream-build/configdata.pm/x86_64-win32-mingw32
index a6dbfe1..920591f 100644
--- a/upstream-build/configdata.pm/x86_64-win32-mingw32
+++ b/upstream-build/configdata.pm/x86_64-win32-mingw32
@@ -59,11 +59,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_MINGW64" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "x86_64-msys-thread-multi",
   perl_cmd => "/usr/bin/perl",
-  perl_version => "5.30.1",
-  perlargv => [ "mingw64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perl_version => "5.32.0",
+  perlargv => [ "mingw64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => "..",
   target => "mingw64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -146,7 +146,7 @@ our %target = (
   cppflags => "-DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN -D_MT",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [  ],
+  defines => [ "ZLIB" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -155,7 +155,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
-  ex_libs => "-lws2_32 -lgdi32 -lcrypt32",
+  ex_libs => "-lz -lws2_32 -lgdi32 -lcrypt32",
   exe_extension => ".exe",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -339,7 +339,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1209,6 +1208,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3201,6 +3205,8 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3230,8 +3236,6 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10753,6 +10757,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11477,6 +11488,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16249,6 +16261,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",
diff --git a/upstream-build/configdata.pm/x86_64-win32-msvc b/upstream-build/configdata.pm/x86_64-win32-msvc
index 1703ed1..eaaa632 100644
--- a/upstream-build/configdata.pm/x86_64-win32-msvc
+++ b/upstream-build/configdata.pm/x86_64-win32-msvc
@@ -63,11 +63,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "--prefix=c:\\install enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib --with-zlib-lib=c:\\zlib\\lib\\zlib.lib --with-zlib-include=c:\\zlib\\include no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
+  options => "--prefix=c:\\install enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib --with-zlib-lib=c:\\zlib64\\lib\\z.dll.lib --with-zlib-include=c:\\zlib64\\include no-afalgeng no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic",
   perl_archname => "MSWin32-x64-multi-thread",
   perl_cmd => "C:\\Perl64\\bin\\perl.exe",
-  perl_version => "5.26.3",
-  perlargv => [ "--prefix=c:\\install", "VC-WIN64A", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib", "--with-zlib-lib=c:\\zlib\\lib\\zlib.lib", "--with-zlib-include=c:\\zlib\\include" ],
+  perl_version => "5.28.1",
+  perlargv => [ "--prefix=c:\\install", "VC-WIN64A", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib", "--with-zlib-lib=c:\\zlib64\\lib\\z.dll.lib", "--with-zlib-include=c:\\zlib64\\include" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => "..",
   target => "VC-WIN64A",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -132,7 +132,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x2583250)",
+  RANLIB => "CODE(0xd63ee8)",
   RC => "rc",
   _conf_fname_int => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -173,9 +173,9 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
-  ex_libs => "c:\\zlib\\lib\\zlib.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib",
+  ex_libs => "c:\\zlib64\\lib\\z.dll.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib",
   exe_extension => "",
-  includes => [ "c:\\zlib\\include" ],
+  includes => [ "c:\\zlib64\\include" ],
   keccak1600_asm_src => "keccak1600.c",
   keccak1600_obj => "keccak1600.o",
   ldoutflag => "/out:",
@@ -361,8 +361,8 @@ our %disabled = (
 );
 
 our %withargs = (
-  zlib_include => "c:\\zlib\\include",
-  zlib_lib => "c:\\zlib\\lib\\zlib.lib",
+  zlib_include => "c:\\zlib64\\include",
+  zlib_lib => "c:\\zlib64\\lib\\z.dll.lib",
 );
 
 our %unified_info = (
@@ -1228,6 +1228,11 @@ our %unified_info = (
                     "libssl",
                     "test\\libtestutil.a",
                 ],
+            "test\\cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test\\libtestutil.a",
+                ],
             "test\\cmsapitest" =>
                 [
                     "libcrypto",
@@ -3221,9 +3226,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ms\\uplink.o",
                             "ms\\applink.o",
                             "ms\\applink.o",
-                            "ms\\uplink.o",
                         ],
                     "products" =>
                         {
@@ -3242,8 +3247,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl\\packet.o",
-                            "ssl\\tls13_enc.o",
                             "ssl\\bio_ssl.o",
                             "ssl\\d1_lib.o",
                             "ssl\\d1_msg.o",
@@ -3273,6 +3276,8 @@ our %unified_info = (
                             "ssl\\t1_trce.o",
                             "ssl\\tls13_enc.o",
                             "ssl\\tls_srp.o",
+                            "ssl\\packet.o",
+                            "ssl\\tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10817,6 +10822,13 @@ our %unified_info = (
                     "include",
                     "..\\include",
                 ],
+            "test\\cmactest.o" =>
+                [
+                    "include",
+                    "apps\\include",
+                    "..\\include",
+                    "..\\apps\\include",
+                ],
             "test\\cmsapitest.o" =>
                 [
                     "include",
@@ -11541,6 +11553,7 @@ our %unified_info = (
             "test\\cipherlist_test",
             "test\\ciphername_test",
             "test\\clienthellotest",
+            "test\\cmactest",
             "test\\cmsapitest",
             "test\\conf_include_test",
             "test\\constant_time_test",
@@ -16296,6 +16309,14 @@ our %unified_info = (
                 [
                     "..\\test\\clienthellotest.c",
                 ],
+            "test\\cmactest" =>
+                [
+                    "test\\cmactest.o",
+                ],
+            "test\\cmactest.o" =>
+                [
+                    "..\\test\\cmactest.c",
+                ],
             "test\\cmsapitest" =>
                 [
                     "test\\cmsapitest.o",