• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision08e136ab31ae8e1e9ae29901c66847b6442f7a8e (tree)
Time2022-10-12 08:38:59
AuthorFs <Fsu0413@vip....>
CommiterFs

Log Message

openssl update

Change Summary

Incremental Difference

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -4,8 +4,8 @@ local conf = {}
44 --[[
55 abbrs:
66 OpenSSL Versions:
7- o1: OpenSSL 1.1.1q
8- o3: OpenSSL 3.0.5
7+ o1: OpenSSL 1.1.1r
8+ o3: OpenSSL 3.0.6
99 Most of OpenSSL builds has its makefiles changed for our use. No "m" will be prefixed.
1010
1111 Platforms:
@@ -45,11 +45,11 @@ abbrs:
4545
4646 --------------------------------------------------------------------
4747
48--- OpenSSL 1.1.1q
48+-- OpenSSL 1.1.1r
4949
5050 conf.o1wx3v5 = {
51- name = "OpenSSL1.1.1q-Windows-x86-VS2015",
52- opensslVersion = "1.1.1q",
51+ name = "OpenSSL1.1.1r-Windows-x86-VS2015",
52+ opensslVersion = "1.1.1r",
5353 host = "Win8",
5454 toolchain = "MSVC2015-32",
5555 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
@@ -64,8 +64,8 @@ conf.o1wx3v5 = {
6464 }
6565
6666 conf.o1wx3v5st = {
67- name = "OpenSSL1.1.1q-Windows-x86-VS2015-static",
68- opensslVersion = "1.1.1q",
67+ name = "OpenSSL1.1.1r-Windows-x86-VS2015-static",
68+ opensslVersion = "1.1.1r",
6969 host = "Win8",
7070 toolchain = "MSVC2015-32",
7171 variant = {"-static"},
@@ -81,8 +81,8 @@ conf.o1wx3v5st = {
8181 }
8282
8383 conf.o1wx6v5 = {
84- name = "OpenSSL1.1.1q-Windows-x86_64-VS2015",
85- opensslVersion = "1.1.1q",
84+ name = "OpenSSL1.1.1r-Windows-x86_64-VS2015",
85+ opensslVersion = "1.1.1r",
8686 host = "Win8",
8787 toolchain = "MSVC2015-64",
8888 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
@@ -99,8 +99,8 @@ conf.o1wx6v5 = {
9999 --------------------------------------------------------------------
100100
101101 conf.o1wx3m7 = {
102- name = "OpenSSL1.1.1q-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
103- opensslVersion = "1.1.1q",
102+ name = "OpenSSL1.1.1r-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
103+ opensslVersion = "1.1.1r",
104104 host = "Win8SH",
105105 toolchain = "MinGW730-32",
106106 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
@@ -115,8 +115,8 @@ conf.o1wx3m7 = {
115115 }
116116
117117 conf.o1wx6m7 = {
118- name = "OpenSSL1.1.1q-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
119- opensslVersion = "1.1.1q",
118+ name = "OpenSSL1.1.1r-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
119+ opensslVersion = "1.1.1r",
120120 host = "Win8SH",
121121 toolchain = "MinGW730-64",
122122 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
@@ -133,8 +133,8 @@ conf.o1wx6m7 = {
133133 --------------------------------------------------------------------
134134
135135 conf.o1wx3v7 = {
136- name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&",
137- opensslVersion = "1.1.1q",
136+ name = "OpenSSL1.1.1r-Windows-x86-VS2017-&TARGETTOOLVERSION&",
137+ opensslVersion = "1.1.1r",
138138 host = "Win10",
139139 toolchain = "MSVC2017-32",
140140 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
@@ -149,8 +149,8 @@ conf.o1wx3v7 = {
149149 }
150150
151151 conf.o1wx3v7st = {
152- name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&-static",
153- opensslVersion = "1.1.1q",
152+ name = "OpenSSL1.1.1r-Windows-x86-VS2017-&TARGETTOOLVERSION&-static",
153+ opensslVersion = "1.1.1r",
154154 host = "Win10",
155155 toolchain = "MSVC2017-32",
156156 variant = {"-static"},
@@ -166,8 +166,8 @@ conf.o1wx3v7st = {
166166 }
167167
168168 conf.o1wx6v7 = {
169- name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
170- opensslVersion = "1.1.1q",
169+ name = "OpenSSL1.1.1r-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
170+ opensslVersion = "1.1.1r",
171171 host = "Win10",
172172 toolchain = "MSVC2017-64",
173173 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
@@ -182,8 +182,8 @@ conf.o1wx6v7 = {
182182 }
183183
184184 conf.o1wx6v7st = {
185- name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&-static",
186- opensslVersion = "1.1.1q",
185+ name = "OpenSSL1.1.1r-Windows-x86_64-VS2017-&TARGETTOOLVERSION&-static",
186+ opensslVersion = "1.1.1r",
187187 host = "Win10",
188188 toolchain = "MSVC2017-64",
189189 variant = {"-static"},
@@ -201,8 +201,8 @@ conf.o1wx6v7st = {
201201 --------------------------------------------------------------------
202202
203203 conf.o1wx3v9 = {
204- name = "OpenSSL1.1.1q-Windows-x86-VS2019-&TARGETTOOLVERSION&",
205- opensslVersion = "1.1.1q",
204+ name = "OpenSSL1.1.1r-Windows-x86-VS2019-&TARGETTOOLVERSION&",
205+ opensslVersion = "1.1.1r",
206206 host = "Win10",
207207 toolchain = "MSVC2019-32",
208208 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
@@ -217,8 +217,8 @@ conf.o1wx3v9 = {
217217 }
218218
219219 conf.o1wx6v9 = {
220- name = "OpenSSL1.1.1q-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
221- opensslVersion = "1.1.1q",
220+ name = "OpenSSL1.1.1r-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
221+ opensslVersion = "1.1.1r",
222222 host = "Win10",
223223 toolchain = "MSVC2019-64",
224224 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
@@ -235,8 +235,8 @@ conf.o1wx6v9 = {
235235 --------------------------------------------------------------------
236236
237237 conf.o1aa3nl = {
238- name = "OpenSSL1.1.1q-Android-arm-NDKr21eAPI21",
239- opensslVersion = "1.1.1q",
238+ name = "OpenSSL1.1.1r-Android-arm-NDKr21eAPI21",
239+ opensslVersion = "1.1.1r",
240240 host = "CentOS8",
241241 target = "Android-21",
242242 toolchainT = "Android-21-r21e-arm",
@@ -260,8 +260,8 @@ conf.o1aa3nl = {
260260 }
261261
262262 conf.o1aa6nl = {
263- name = "OpenSSL1.1.1q-Android-arm64-NDKr21eAPI21",
264- opensslVersion = "1.1.1q",
263+ name = "OpenSSL1.1.1r-Android-arm64-NDKr21eAPI21",
264+ opensslVersion = "1.1.1r",
265265 host = "CentOS8",
266266 target = "Android-21",
267267 toolchainT = "Android-21-r21e-arm64",
@@ -280,8 +280,8 @@ conf.o1aa6nl = {
280280 }
281281
282282 conf.o1ax3nl = {
283- name = "OpenSSL1.1.1q-Android-x86-NDKr21eAPI21",
284- opensslVersion = "1.1.1q",
283+ name = "OpenSSL1.1.1r-Android-x86-NDKr21eAPI21",
284+ opensslVersion = "1.1.1r",
285285 host = "CentOS8",
286286 target = "Android-21",
287287 toolchainT = "Android-21-r21e-x86",
@@ -300,8 +300,8 @@ conf.o1ax3nl = {
300300 }
301301
302302 conf.o1ax6nl = {
303- name = "OpenSSL1.1.1q-Android-x86_64-NDKr21eAPI21",
304- opensslVersion = "1.1.1q",
303+ name = "OpenSSL1.1.1r-Android-x86_64-NDKr21eAPI21",
304+ opensslVersion = "1.1.1r",
305305 host = "CentOS8",
306306 target = "Android-21",
307307 toolchainT = "Android-21-r21e-x86_64",
@@ -320,8 +320,8 @@ conf.o1ax6nl = {
320320 }
321321
322322 conf.o1aalnl = {
323- name = "OpenSSL1.1.1q-Android-ALL-NDKr21eAPI21",
324- opensslVersion = "1.1.1q",
323+ name = "OpenSSL1.1.1r-Android-ALL-NDKr21eAPI21",
324+ opensslVersion = "1.1.1r",
325325 host = "CentOS8",
326326 opensslAndroidAll = {
327327 ["armeabi-v7a"] = "o1aa3nl",
@@ -333,11 +333,11 @@ conf.o1aalnl = {
333333
334334 --------------------------------------------------------------------
335335
336--- OpenSSL 3.0.5
336+-- OpenSSL 3.0.6
337337
338338 conf.o3wx6v9 = {
339- name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
340- opensslVersion = "3.0.5",
339+ name = "OpenSSL3.0.6-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
340+ opensslVersion = "3.0.6",
341341 host = "Win10",
342342 toolchain = "MSVC2019-64",
343343 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -352,8 +352,8 @@ conf.o3wx6v9 = {
352352 }
353353
354354 conf.o3wx6v9st = {
355- name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
356- opensslVersion = "3.0.5",
355+ name = "OpenSSL3.0.6-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
356+ opensslVersion = "3.0.6",
357357 host = "Win10",
358358 toolchain = "MSVC2019-64",
359359 variant = {"-static"},
@@ -369,8 +369,8 @@ conf.o3wx6v9st = {
369369 }
370370
371371 conf.o3wx6v2 = {
372- name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
373- opensslVersion = "3.0.5",
372+ name = "OpenSSL3.0.6-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
373+ opensslVersion = "3.0.6",
374374 host = "Win10",
375375 toolchain = "MSVC2022-64",
376376 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -385,8 +385,8 @@ conf.o3wx6v2 = {
385385 }
386386
387387 conf.o3wx6v2st = {
388- name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
389- opensslVersion = "3.0.5",
388+ name = "OpenSSL3.0.6-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
389+ opensslVersion = "3.0.6",
390390 host = "Win10",
391391 toolchain = "MSVC2022-64",
392392 variant = {"-static"},
@@ -406,8 +406,8 @@ conf.o3wx6v2st = {
406406 -- Note: "m" changed its meaning for LLVM-based toolchain with MinGW-w64 MSVCRT.
407407 -- Note: Future version of this build configuration should be called "o*wx6g1" where "g" means GNU-based toolchain with MinGW-w64.
408408 conf.o3wx6m1 = {
409- name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
410- opensslVersion = "3.0.5",
409+ name = "OpenSSL3.0.6-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
410+ opensslVersion = "3.0.6",
411411 host = "Win10SH",
412412 toolchain = "MinGW1120-64",
413413 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -425,8 +425,8 @@ conf.o3wx6m1 = {
425425 -- Note: "m" changed its meaning for LLVM-based toolchain with MinGW-w64 MSVCRT.
426426 -- Note: Future version of this build configuration should be called "o*wx6g2" where "g" means GNU-based toolchain with MinGW-w64.
427427 conf.o3wx6m2 = {
428- name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
429- opensslVersion = "3.0.5",
428+ name = "OpenSSL3.0.6-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
429+ opensslVersion = "3.0.6",
430430 host = "Win10SH",
431431 toolchain = "MinGW1210-64",
432432 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -442,8 +442,8 @@ conf.o3wx6m2 = {
442442 }
443443
444444 conf.o3wx6u5 = {
445- name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
446- opensslVersion = "3.0.5",
445+ name = "OpenSSL3.0.6-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
446+ opensslVersion = "3.0.6",
447447 host = "Win10SH",
448448 toolchain = "MinGWLLVM-ucrt15-64",
449449 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -460,8 +460,8 @@ conf.o3wx6u5 = {
460460 }
461461
462462 conf.o3wx6s5 = {
463- name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
464- opensslVersion = "3.0.5",
463+ name = "OpenSSL3.0.6-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
464+ opensslVersion = "3.0.6",
465465 host = "Win10SH",
466466 toolchain = "MinGWLLVM-msvcrt15-64",
467467 libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },
@@ -480,8 +480,8 @@ conf.o3wx6s5 = {
480480 --------------------------------------------------------------------
481481
482482 conf.o3mx6 = {
483- name = "OpenSSL3.0.5-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
484- opensslVersion = "3.0.5",
483+ name = "OpenSSL3.0.6-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
484+ opensslVersion = "3.0.6",
485485 host = "macOS1015",
486486 libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
487487 staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
@@ -496,8 +496,8 @@ conf.o3mx6 = {
496496 }
497497
498498 conf.o3ma6 = {
499- name = "OpenSSL3.0.5-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
500- opensslVersion = "3.0.5",
499+ name = "OpenSSL3.0.6-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
500+ opensslVersion = "3.0.6",
501501 host = "macOSM1",
502502 libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
503503 staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
@@ -514,8 +514,8 @@ conf.o3ma6 = {
514514 --------------------------------------------------------------------
515515
516516 conf.o3aa3n324 = {
517- name = "OpenSSL3.0.5-Android-arm-NDKr23cAPI24",
518- opensslVersion = "3.0.5",
517+ name = "OpenSSL3.0.6-Android-arm-NDKr23cAPI24",
518+ opensslVersion = "3.0.6",
519519 host = "CentOS8",
520520 target = "Android-24",
521521 toolchainT = "Android-24-r23c-arm",
@@ -539,8 +539,8 @@ conf.o3aa3n324 = {
539539 }
540540
541541 conf.o3aa6n324 = {
542- name = "OpenSSL3.0.5-Android-arm64-NDKr23cAPI24",
543- opensslVersion = "3.0.5",
542+ name = "OpenSSL3.0.6-Android-arm64-NDKr23cAPI24",
543+ opensslVersion = "3.0.6",
544544 host = "CentOS8",
545545 target = "Android-24",
546546 toolchainT = "Android-24-r23c-arm64",
@@ -559,8 +559,8 @@ conf.o3aa6n324 = {
559559 }
560560
561561 conf.o3ax3n324 = {
562- name = "OpenSSL3.0.5-Android-x86-NDKr23cAPI24",
563- opensslVersion = "3.0.5",
562+ name = "OpenSSL3.0.6-Android-x86-NDKr23cAPI24",
563+ opensslVersion = "3.0.6",
564564 host = "CentOS8",
565565 target = "Android-24",
566566 toolchainT = "Android-24-r23c-x86",
@@ -579,8 +579,8 @@ conf.o3ax3n324 = {
579579 }
580580
581581 conf.o3ax6n324 = {
582- name = "OpenSSL3.0.5-Android-x86_64-NDKr23cAPI24",
583- opensslVersion = "3.0.5",
582+ name = "OpenSSL3.0.6-Android-x86_64-NDKr23cAPI24",
583+ opensslVersion = "3.0.6",
584584 host = "CentOS8",
585585 target = "Android-24",
586586 toolchainT = "Android-24-r23c-x86_64",
@@ -599,8 +599,8 @@ conf.o3ax6n324 = {
599599 }
600600
601601 conf.o3aaln324 = {
602- name = "OpenSSL3.0.5-Android-ALL-NDKr23cAPI24",
603- opensslVersion = "3.0.5",
602+ name = "OpenSSL3.0.6-Android-ALL-NDKr23cAPI24",
603+ opensslVersion = "3.0.6",
604604 host = "CentOS8",
605605 opensslAndroidAll = {
606606 ["armeabi-v7a"] = "o3aa3n324",
@@ -612,8 +612,8 @@ conf.o3aaln324 = {
612612 --------------------------------------------------------------------
613613
614614 conf.o3aa3n527 = {
615- name = "OpenSSL3.0.5-Android-arm-NDKr25API27",
616- opensslVersion = "3.0.5",
615+ name = "OpenSSL3.0.6-Android-arm-NDKr25API27",
616+ opensslVersion = "3.0.6",
617617 host = "Rocky9",
618618 target = "Android-27",
619619 toolchainT = "Android-27-r25b-arm",
@@ -637,8 +637,8 @@ conf.o3aa3n527 = {
637637 }
638638
639639 conf.o3aa6n527 = {
640- name = "OpenSSL3.0.5-Android-arm64-NDKr25API27",
641- opensslVersion = "3.0.5",
640+ name = "OpenSSL3.0.6-Android-arm64-NDKr25API27",
641+ opensslVersion = "3.0.6",
642642 host = "Rocky9",
643643 target = "Android-27",
644644 toolchainT = "Android-27-r25b-arm64",
@@ -657,8 +657,8 @@ conf.o3aa6n527 = {
657657 }
658658
659659 conf.o3ax3n527 = {
660- name = "OpenSSL3.0.5-Android-x86-NDKr25API27",
661- opensslVersion = "3.0.5",
660+ name = "OpenSSL3.0.6-Android-x86-NDKr25API27",
661+ opensslVersion = "3.0.6",
662662 host = "Rocky9",
663663 target = "Android-27",
664664 toolchainT = "Android-27-r25b-x86",
@@ -677,8 +677,8 @@ conf.o3ax3n527 = {
677677 }
678678
679679 conf.o3ax6n527 = {
680- name = "OpenSSL3.0.5-Android-x86_64-NDKr25API27",
681- opensslVersion = "3.0.5",
680+ name = "OpenSSL3.0.6-Android-x86_64-NDKr25API27",
681+ opensslVersion = "3.0.6",
682682 host = "Rocky9",
683683 target = "Android-27",
684684 toolchainT = "Android-27-r25b-x86_64",
@@ -697,8 +697,8 @@ conf.o3ax6n527 = {
697697 }
698698
699699 conf.o3aaln527 = {
700- name = "OpenSSL3.0.5-Android-ALL-NDKr25API27",
701- opensslVersion = "3.0.5",
700+ name = "OpenSSL3.0.6-Android-ALL-NDKr25API27",
701+ opensslVersion = "3.0.6",
702702 host = "Rocky9",
703703 opensslAndroidAll = {
704704 ["armeabi-v7a"] = "o3aa3n527",