From 24d43fe451d3f4fa6b15665cfa3353f4c08a5f5d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 6 Jul 2023 10:41:20 +0300
Subject: Release version 1.1.1+21

Upgrade to 1.1.1u. That in particular fixes CVE-2023-0464 CVE-2023-0465
CVE-2023-0466 CVE-2023-2650.

Update .gitignore files
---
 upstream-build/configdata.pm/i686-win32-msvc | 29 ++++++++--------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'upstream-build/configdata.pm/i686-win32-msvc')

diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc
index 264731b..f3d5631 100644
--- a/upstream-build/configdata.pm/i686-win32-msvc
+++ b/upstream-build/configdata.pm/i686-win32-msvc
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => "..",
   target => "VC-WIN32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1t",
-  version_num => "0x1010114fL",
+  version => "1.1.1u",
+  version_num => "0x1010115fL",
 );
 
 our %target = (
@@ -132,7 +132,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x724088)",
+  RANLIB => "CODE(0x25344f0)",
   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",
@@ -1998,7 +1998,6 @@ our %unified_info = (
                             "crypto\\bn\\bn_srp.o",
                             "crypto\\bn\\bn_word.o",
                             "crypto\\bn\\bn_x931p.o",
-                            "crypto\\bn\\rsa_sup_mul.o",
                         ],
                     "products" =>
                         {
@@ -3225,10 +3224,10 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ms\\uplink.o",
                             "ms\\applink.o",
                             "ms\\applink.o",
                             "ms\\applink.o",
-                            "ms\\uplink.o",
                         ],
                     "products" =>
                         {
@@ -3248,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",
@@ -3279,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" =>
                         {
@@ -6170,13 +6169,6 @@ our %unified_info = (
                     "crypto",
                     "..\\crypto",
                 ],
-            "crypto\\bn\\rsa_sup_mul.o" =>
-                [
-                    ".",
-                    "include",
-                    "..",
-                    "..\\include",
-                ],
             "crypto\\bn\\sparct4-mont.o" =>
                 [
                     "crypto",
@@ -10032,12 +10024,12 @@ our %unified_info = (
                 ],
             "ms\\applink.o" =>
                 [
-                    "crypto\\ec",
                     "apps",
+                    "crypto\\ec",
                     ".",
                     "include",
-                    "..\\crypto\\ec",
                     "..\\apps",
+                    "..\\crypto\\ec",
                     "..",
                     "..\\include",
                 ],
@@ -12536,10 +12528,6 @@ our %unified_info = (
                 [
                     "..\\crypto\\bn\\bn_x931p.c",
                 ],
-            "crypto\\bn\\rsa_sup_mul.o" =>
-                [
-                    "..\\crypto\\bn\\rsa_sup_mul.c",
-                ],
             "crypto\\buffer\\buf_err.o" =>
                 [
                     "..\\crypto\\buffer\\buf_err.c",
@@ -14823,7 +14811,6 @@ our %unified_info = (
                     "crypto\\bn\\bn_srp.o",
                     "crypto\\bn\\bn_word.o",
                     "crypto\\bn\\bn_x931p.o",
-                    "crypto\\bn\\rsa_sup_mul.o",
                     "crypto\\buffer\\buf_err.o",
                     "crypto\\buffer\\buffer.o",
                     "crypto\\camellia\\camellia.o",
-- 
cgit v1.1