Skip to content

Commit c7d979f

Browse files
zoobazooba
committed
Closes python#23686: Update Windows installer OpenSSL to 1.0.2a
1 parent f172cae commit c7d979f

4 files changed

Lines changed: 27 additions & 10 deletions

File tree

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
5454
for %%e in (
5555
bzip2-1.0.6
5656
nasm-2.11.06
57-
openssl-1.0.1l
57+
openssl-1.0.2a
5858
tcl-core-8.6.3.1
5959
tk-8.6.3.1
6060
tix-8.4.3.4

‎PCbuild/libeay.vcxproj‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@
181181
<ClCompile Include="$(opensslDir)crypto\bf\bf_skey.c" />
182182
<ClCompile Include="$(opensslDir)crypto\bio\b_dump.c" />
183183
<ClCompile Include="$(opensslDir)crypto\bio\b_print.c" />
184-
<!--
185184
<ClCompile Include="$(opensslDir)crypto\bio\b_sock.c" />
186-
-->
187185
<ClCompile Include="$(opensslDir)crypto\bio\bf_buff.c" />
188186
<!--
189187
<ClCompile Include="$(opensslDir)crypto\bio\bf_nbio.c" />
@@ -195,7 +193,9 @@
195193
<!--
196194
<ClCompile Include="$(opensslDir)crypto\bio\bss_acpt.c" />
197195
<ClCompile Include="$(opensslDir)crypto\bio\bss_bio.c" />
196+
-->
198197
<ClCompile Include="$(opensslDir)crypto\bio\bss_conn.c" />
198+
<!--
199199
<ClCompile Include="$(opensslDir)crypto\bio\bss_dgram.c" />
200200
<ClCompile Include="$(opensslDir)crypto\bio\bss_fd.c" />
201201
-->
@@ -271,6 +271,7 @@
271271
<ClCompile Include="$(opensslDir)crypto\cms\cms_ess.c" />
272272
-->
273273
<ClCompile Include="$(opensslDir)crypto\cms\cms_io.c" />
274+
<ClCompile Include="$(opensslDir)crypto\cms\cms_kari.c" />
274275
<ClCompile Include="$(opensslDir)crypto\cms\cms_lib.c" />
275276
<ClCompile Include="$(opensslDir)crypto\cms\cms_pwri.c" />
276277
<ClCompile Include="$(opensslDir)crypto\cms\cms_sd.c" />
@@ -334,12 +335,14 @@
334335
-->
335336
<ClCompile Include="$(opensslDir)crypto\dh\dh_err.c" />
336337
<ClCompile Include="$(opensslDir)crypto\dh\dh_gen.c" />
338+
<ClCompile Include="$(opensslDir)crypto\dh\dh_kdf.c" />
337339
<ClCompile Include="$(opensslDir)crypto\dh\dh_key.c" />
338340
<ClCompile Include="$(opensslDir)crypto\dh\dh_lib.c" />
339341
<ClCompile Include="$(opensslDir)crypto\dh\dh_pmeth.c" />
340342
<!--
341343
<ClCompile Include="$(opensslDir)crypto\dh\dh_prn.c" />
342344
-->
345+
<ClCompile Include="$(opensslDir)crypto\dh\dh_rfc5114.c" />
343346
<ClCompile Include="$(opensslDir)crypto\dsa\dsa_ameth.c" />
344347
<ClCompile Include="$(opensslDir)crypto\dsa\dsa_asn1.c" />
345348
<!--
@@ -403,6 +406,7 @@
403406
<ClCompile Include="$(opensslDir)crypto\ec\ecp_oct.c" />
404407
<ClCompile Include="$(opensslDir)crypto\ec\ecp_smpl.c" />
405408
<ClCompile Include="$(opensslDir)crypto\ecdh\ech_err.c" />
409+
<ClCompile Include="$(opensslDir)crypto\ecdh\ech_kdf.c" />
406410
<ClCompile Include="$(opensslDir)crypto\ecdh\ech_key.c" />
407411
<ClCompile Include="$(opensslDir)crypto\ecdh\ech_lib.c" />
408412
<ClCompile Include="$(opensslDir)crypto\ecdh\ech_ossl.c" />
@@ -461,6 +465,7 @@
461465
<ClCompile Include="$(opensslDir)crypto\evp\digest.c" />
462466
<ClCompile Include="$(opensslDir)crypto\evp\e_aes.c" />
463467
<ClCompile Include="$(opensslDir)crypto\evp\e_aes_cbc_hmac_sha1.c" />
468+
<ClCompile Include="$(opensslDir)crypto\evp\e_aes_cbc_hmac_sha256.c" />
464469
<ClCompile Include="$(opensslDir)crypto\evp\e_bf.c" />
465470
<ClCompile Include="$(opensslDir)crypto\evp\e_camellia.c" />
466471
<ClCompile Include="$(opensslDir)crypto\evp\e_cast.c" />
@@ -553,6 +558,7 @@
553558
<ClCompile Include="$(opensslDir)crypto\modes\cts128.c" />
554559
<ClCompile Include="$(opensslDir)crypto\modes\gcm128.c" />
555560
<ClCompile Include="$(opensslDir)crypto\modes\ofb128.c" />
561+
<ClCompile Include="$(opensslDir)crypto\modes\wrap128.c" />
556562
<ClCompile Include="$(opensslDir)crypto\modes\xts128.c" />
557563
<ClCompile Include="$(opensslDir)crypto\o_dir.c" />
558564
<!--
@@ -575,8 +581,10 @@
575581
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_err.c" />
576582
<!--
577583
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_ext.c" />
584+
-->
578585
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_ht.c" />
579586
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_lib.c" />
587+
<!--
580588
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_prn.c" />
581589
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_srv.c" />
582590
<ClCompile Include="$(opensslDir)crypto\ocsp\ocsp_vfy.c" />
@@ -740,15 +748,11 @@
740748
<ClCompile Include="$(opensslDir)crypto\x509\x509_set.c" />
741749
-->
742750
<ClCompile Include="$(opensslDir)crypto\x509\x509_trs.c" />
743-
<!--
744751
<ClCompile Include="$(opensslDir)crypto\x509\x509_txt.c" />
745-
-->
746752
<ClCompile Include="$(opensslDir)crypto\x509\x509_v3.c" />
747753
<ClCompile Include="$(opensslDir)crypto\x509\x509_vfy.c" />
748754
<ClCompile Include="$(opensslDir)crypto\x509\x509_vpm.c" />
749-
<!--
750755
<ClCompile Include="$(opensslDir)crypto\x509\x509cset.c" />
751-
-->
752756
<ClCompile Include="$(opensslDir)crypto\x509\x509name.c" />
753757
<ClCompile Include="$(opensslDir)crypto\x509\x509rset.c" />
754758
<!--
@@ -791,6 +795,7 @@
791795
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_pmaps.c" />
792796
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_prn.c" />
793797
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_purp.c" />
798+
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_scts.c" />
794799
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_skey.c" />
795800
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_sxnet.c" />
796801
<ClCompile Include="$(opensslDir)crypto\x509v3\v3_utl.c" />
@@ -822,6 +827,14 @@
822827
<ClCompile Include="$(opensslDir)engines\e_padlock.c" />
823828
<ClCompile Include="$(opensslDir)engines\e_sureware.c" />
824829
<ClCompile Include="$(opensslDir)engines\e_ubsec.c" />
830+
<ClCompile Include="$(opensslDir)ssl\d1_clnt.c" />
831+
<ClCompile Include="$(opensslDir)ssl\d1_meth.c" />
832+
<ClCompile Include="$(opensslDir)ssl\d1_lib.c" />
833+
<ClCompile Include="$(opensslDir)ssl\d1_srvr.c" />
834+
<ClCompile Include="$(opensslDir)ssl\s2_srvr.c" />
835+
<ClCompile Include="$(opensslDir)ssl\t1_clnt.c" />
836+
<ClCompile Include="$(opensslDir)ssl\t1_ext.c" />
837+
<ClCompile Include="$(opensslDir)ssl\t1_srvr.c" />
825838
</ItemGroup>
826839
<ItemGroup Condition="$(Platform) == 'Win32'">
827840
<ClCompile Include="$(opensslDir)crypto\whrlpool\wp_block.c" />
@@ -861,16 +874,20 @@
861874
<ItemGroup Condition="$(Platform) == 'x64'">
862875
<NasmCompile Include="$(opensslDir)tmp64\aesni-sha1-x86_64.asm" />
863876
<NasmCompile Include="$(opensslDir)tmp64\aesni-sha1-x86_64.asm" />
877+
<NasmCompile Include="$(opensslDir)tmp64\aesni-gcm-x86_64.asm" />
878+
<NasmCompile Include="$(opensslDir)tmp64\aesni-mb-x86_64.asm" />
879+
<NasmCompile Include="$(opensslDir)tmp64\aesni-sha256-x86_64.asm" />
864880
<NasmCompile Include="$(opensslDir)tmp64\aesni-x86_64.asm" />
865881
<NasmCompile Include="$(opensslDir)tmp64\aes-x86_64.asm" />
866882
<NasmCompile Include="$(opensslDir)tmp64\bsaes-x86_64.asm" />
867883
<NasmCompile Include="$(opensslDir)tmp64\cmll-x86_64.asm" />
868884
<NasmCompile Include="$(opensslDir)tmp64\ghash-x86_64.asm" />
869885
<NasmCompile Include="$(opensslDir)tmp64\md5-x86_64.asm" />
870-
<NasmCompile Include="$(opensslDir)tmp64\modexp512-x86_64.asm" />
871886
<NasmCompile Include="$(opensslDir)tmp64\rc4-md5-x86_64.asm" />
872887
<NasmCompile Include="$(opensslDir)tmp64\rc4-x86_64.asm" />
873888
<NasmCompile Include="$(opensslDir)tmp64\sha1-x86_64.asm" />
889+
<NasmCompile Include="$(opensslDir)tmp64\sha1-mb-x86_64.asm" />
890+
<NasmCompile Include="$(opensslDir)tmp64\sha256-mb-x86_64.asm" />
874891
<NasmCompile Include="$(opensslDir)tmp64\sha256-x86_64.asm" />
875892
<NasmCompile Include="$(opensslDir)tmp64\sha512-x86_64.asm" />
876893
<NasmCompile Include="$(opensslDir)tmp64\vpaes-x86_64.asm" />

‎PCbuild/python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.3.1\</sqlite3Dir>
3535
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
3636
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
37-
<opensslDir>$(ExternalsDir)openssl-1.0.1l\</opensslDir>
37+
<opensslDir>$(ExternalsDir)openssl-1.0.2a\</opensslDir>
3838
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
3939

4040
<!-- Suffix for all binaries when building for debug -->

‎PCbuild/ssleay.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<ClCompile Include="$(opensslDir)ssl\d1_both.c" />
5757
<!--
5858
<ClCompile Include="$(opensslDir)ssl\d1_clnt.c" />
59-
-->
6059
<ClCompile Include="$(opensslDir)ssl\d1_enc.c" />
60+
-->
6161
<ClCompile Include="$(opensslDir)ssl\d1_lib.c" />
6262
<!--
6363
<ClCompile Include="$(opensslDir)ssl\d1_meth.c" />

0 commit comments

Comments
 (0)