Skip to content

Commit 9429bf8

Browse files
committed
Update OpenSSL 1.1.1q
1 parent 033fcb4 commit 9429bf8

File tree

64 files changed

+262
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+262
-125
lines changed

Frameworks/OpenSSL.xcframework/Info.plist

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@
66
<array>
77
<dict>
88
<key>LibraryIdentifier</key>
9-
<string>ios-arm64_armv7</string>
9+
<string>ios-arm64_x86_64-maccatalyst</string>
1010
<key>LibraryPath</key>
1111
<string>OpenSSL.framework</string>
1212
<key>SupportedArchitectures</key>
1313
<array>
1414
<string>arm64</string>
15-
<string>armv7</string>
15+
<string>x86_64</string>
1616
</array>
1717
<key>SupportedPlatform</key>
1818
<string>ios</string>
19+
<key>SupportedPlatformVariant</key>
20+
<string>maccatalyst</string>
1921
</dict>
2022
<dict>
2123
<key>LibraryIdentifier</key>
@@ -32,34 +34,32 @@
3234
</dict>
3335
<dict>
3436
<key>LibraryIdentifier</key>
35-
<string>ios-arm64_i386_x86_64-simulator</string>
37+
<string>ios-arm64_armv7</string>
3638
<key>LibraryPath</key>
3739
<string>OpenSSL.framework</string>
3840
<key>SupportedArchitectures</key>
3941
<array>
4042
<string>arm64</string>
41-
<string>i386</string>
42-
<string>x86_64</string>
43+
<string>armv7</string>
4344
</array>
4445
<key>SupportedPlatform</key>
4546
<string>ios</string>
46-
<key>SupportedPlatformVariant</key>
47-
<string>simulator</string>
4847
</dict>
4948
<dict>
5049
<key>LibraryIdentifier</key>
51-
<string>ios-arm64_x86_64-maccatalyst</string>
50+
<string>ios-arm64_i386_x86_64-simulator</string>
5251
<key>LibraryPath</key>
5352
<string>OpenSSL.framework</string>
5453
<key>SupportedArchitectures</key>
5554
<array>
5655
<string>arm64</string>
56+
<string>i386</string>
5757
<string>x86_64</string>
5858
</array>
5959
<key>SupportedPlatform</key>
6060
<string>ios</string>
6161
<key>SupportedPlatformVariant</key>
62-
<string>maccatalyst</string>
62+
<string>simulator</string>
6363
</dict>
6464
</array>
6565
<key>CFBundlePackageType</key>

Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/opensslv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ extern "C" {
3939
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
4040
* major minor fix final patch/beta)
4141
*/
42-
# define OPENSSL_VERSION_NUMBER 0x101010ffL
43-
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1o 3 May 2022"
42+
# define OPENSSL_VERSION_NUMBER 0x1010111fL
43+
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1q 5 Jul 2022"
4444

4545
/*-
4646
* The macros below are to be used for shared library (.so, .dll, ...)

Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/Headers/ssl.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
44
* Copyright 2005 Nokia. All rights reserved.
55
*
@@ -1305,6 +1305,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13051305
# define SSL_CTRL_GET_MAX_PROTO_VERSION 131
13061306
# define SSL_CTRL_GET_SIGNATURE_NID 132
13071307
# define SSL_CTRL_GET_TMP_KEY 133
1308+
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
1309+
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
13081310
# define SSL_CERT_SET_FIRST 1
13091311
# define SSL_CERT_SET_NEXT 2
13101312
# define SSL_CERT_SET_SERVER 3
@@ -1360,10 +1362,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13601362
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13611363
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
13621364
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1365+
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
1366+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13631367
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
13641368
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13651369
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
13661370
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1371+
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
1372+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13671373
# define SSL_set0_chain(s,sk) \
13681374
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
13691375
# define SSL_set1_chain(s,sk) \
@@ -1386,10 +1392,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13861392
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13871393
# define SSL_set1_verify_cert_store(s,st) \
13881394
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1395+
#define SSL_get0_verify_cert_store(s,st) \
1396+
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13891397
# define SSL_set0_chain_cert_store(s,st) \
13901398
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13911399
# define SSL_set1_chain_cert_store(s,st) \
13921400
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1401+
#define SSL_get0_chain_cert_store(s,st) \
1402+
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13931403
# define SSL_get1_groups(s, glist) \
13941404
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
13951405
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \
Binary file not shown.
Binary file not shown.

Frameworks/OpenSSL.xcframework/ios-arm64_armv7/OpenSSL.framework/_CodeSignature/CodeResources

+7-7
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
</data>
251251
<key>Headers/opensslv.h</key>
252252
<data>
253-
XGPjOOOXiLTQCSJGQ+o8CBkkq0s=
253+
Fo2e1aEEJftku0gF4/WjfFulauA=
254254
</data>
255255
<key>Headers/ossl_typ.h</key>
256256
<data>
@@ -346,7 +346,7 @@
346346
</data>
347347
<key>Headers/ssl.h</key>
348348
<data>
349-
UY15ryuxAKhmHr4/BIm6u1TQgfs=
349+
mhalYjN/qeuEF+l6WIVquvXvjOs=
350350
</data>
351351
<key>Headers/ssl2.h</key>
352352
<data>
@@ -426,7 +426,7 @@
426426
</data>
427427
<key>Info.plist</key>
428428
<data>
429-
J6mmFKTEygTHCtoiH3+Xzuyl+Xg=
429+
1w5Ob+2GhhW+zTxI6DZBX+YdAUw=
430430
</data>
431431
<key>Modules/module.modulemap</key>
432432
<data>
@@ -1110,11 +1110,11 @@
11101110
<dict>
11111111
<key>hash</key>
11121112
<data>
1113-
XGPjOOOXiLTQCSJGQ+o8CBkkq0s=
1113+
Fo2e1aEEJftku0gF4/WjfFulauA=
11141114
</data>
11151115
<key>hash2</key>
11161116
<data>
1117-
V2Z5qCrOb4aW5CCg3lPlCZJjBEM2VCHqFxlREjnnmuE=
1117+
JrJWz/kKAPkRW/+c/vbQJl1LrrQnmMUWvJIhMk8RJRE=
11181118
</data>
11191119
</dict>
11201120
<key>Headers/ossl_typ.h</key>
@@ -1374,11 +1374,11 @@
13741374
<dict>
13751375
<key>hash</key>
13761376
<data>
1377-
UY15ryuxAKhmHr4/BIm6u1TQgfs=
1377+
mhalYjN/qeuEF+l6WIVquvXvjOs=
13781378
</data>
13791379
<key>hash2</key>
13801380
<data>
1381-
xgAG9h1I7BkDK2chlLXuf1NfmlNxJZgNriAGt9Icyhs=
1381+
Z+hVP6OlpyPzsPKff23VH/dbSj1OeZ6x2Y710a9gnlI=
13821382
</data>
13831383
</dict>
13841384
<key>Headers/ssl2.h</key>

Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ extern "C" {
3939
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
4040
* major minor fix final patch/beta)
4141
*/
42-
# define OPENSSL_VERSION_NUMBER 0x101010ffL
43-
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1o 3 May 2022"
42+
# define OPENSSL_VERSION_NUMBER 0x1010111fL
43+
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1q 5 Jul 2022"
4444

4545
/*-
4646
* The macros below are to be used for shared library (.so, .dll, ...)

Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/Headers/ssl.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
44
* Copyright 2005 Nokia. All rights reserved.
55
*
@@ -1305,6 +1305,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13051305
# define SSL_CTRL_GET_MAX_PROTO_VERSION 131
13061306
# define SSL_CTRL_GET_SIGNATURE_NID 132
13071307
# define SSL_CTRL_GET_TMP_KEY 133
1308+
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
1309+
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
13081310
# define SSL_CERT_SET_FIRST 1
13091311
# define SSL_CERT_SET_NEXT 2
13101312
# define SSL_CERT_SET_SERVER 3
@@ -1360,10 +1362,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13601362
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13611363
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
13621364
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1365+
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
1366+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13631367
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
13641368
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13651369
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
13661370
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1371+
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
1372+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13671373
# define SSL_set0_chain(s,sk) \
13681374
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
13691375
# define SSL_set1_chain(s,sk) \
@@ -1386,10 +1392,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13861392
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13871393
# define SSL_set1_verify_cert_store(s,st) \
13881394
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1395+
#define SSL_get0_verify_cert_store(s,st) \
1396+
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13891397
# define SSL_set0_chain_cert_store(s,st) \
13901398
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13911399
# define SSL_set1_chain_cert_store(s,st) \
13921400
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1401+
#define SSL_get0_chain_cert_store(s,st) \
1402+
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13931403
# define SSL_get1_groups(s, glist) \
13941404
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
13951405
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \

Frameworks/OpenSSL.xcframework/ios-arm64_i386_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources

+7-7
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
</data>
251251
<key>Headers/opensslv.h</key>
252252
<data>
253-
XGPjOOOXiLTQCSJGQ+o8CBkkq0s=
253+
Fo2e1aEEJftku0gF4/WjfFulauA=
254254
</data>
255255
<key>Headers/ossl_typ.h</key>
256256
<data>
@@ -346,7 +346,7 @@
346346
</data>
347347
<key>Headers/ssl.h</key>
348348
<data>
349-
UY15ryuxAKhmHr4/BIm6u1TQgfs=
349+
mhalYjN/qeuEF+l6WIVquvXvjOs=
350350
</data>
351351
<key>Headers/ssl2.h</key>
352352
<data>
@@ -426,7 +426,7 @@
426426
</data>
427427
<key>Info.plist</key>
428428
<data>
429-
q80NAak57Ooed8Hniwrx/ohelBU=
429+
Z+OVdJHrJByluOQXprJRbY09QQc=
430430
</data>
431431
<key>Modules/module.modulemap</key>
432432
<data>
@@ -1110,11 +1110,11 @@
11101110
<dict>
11111111
<key>hash</key>
11121112
<data>
1113-
XGPjOOOXiLTQCSJGQ+o8CBkkq0s=
1113+
Fo2e1aEEJftku0gF4/WjfFulauA=
11141114
</data>
11151115
<key>hash2</key>
11161116
<data>
1117-
V2Z5qCrOb4aW5CCg3lPlCZJjBEM2VCHqFxlREjnnmuE=
1117+
JrJWz/kKAPkRW/+c/vbQJl1LrrQnmMUWvJIhMk8RJRE=
11181118
</data>
11191119
</dict>
11201120
<key>Headers/ossl_typ.h</key>
@@ -1374,11 +1374,11 @@
13741374
<dict>
13751375
<key>hash</key>
13761376
<data>
1377-
UY15ryuxAKhmHr4/BIm6u1TQgfs=
1377+
mhalYjN/qeuEF+l6WIVquvXvjOs=
13781378
</data>
13791379
<key>hash2</key>
13801380
<data>
1381-
xgAG9h1I7BkDK2chlLXuf1NfmlNxJZgNriAGt9Icyhs=
1381+
Z+hVP6OlpyPzsPKff23VH/dbSj1OeZ6x2Y710a9gnlI=
13821382
</data>
13831383
</dict>
13841384
<key>Headers/ssl2.h</key>

Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ extern "C" {
3939
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
4040
* major minor fix final patch/beta)
4141
*/
42-
# define OPENSSL_VERSION_NUMBER 0x101010ffL
43-
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1o 3 May 2022"
42+
# define OPENSSL_VERSION_NUMBER 0x1010111fL
43+
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1q 5 Jul 2022"
4444

4545
/*-
4646
* The macros below are to be used for shared library (.so, .dll, ...)

Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
44
* Copyright 2005 Nokia. All rights reserved.
55
*
@@ -1305,6 +1305,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13051305
# define SSL_CTRL_GET_MAX_PROTO_VERSION 131
13061306
# define SSL_CTRL_GET_SIGNATURE_NID 132
13071307
# define SSL_CTRL_GET_TMP_KEY 133
1308+
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
1309+
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
13081310
# define SSL_CERT_SET_FIRST 1
13091311
# define SSL_CERT_SET_NEXT 2
13101312
# define SSL_CERT_SET_SERVER 3
@@ -1360,10 +1362,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13601362
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13611363
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
13621364
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1365+
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
1366+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13631367
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
13641368
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13651369
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
13661370
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1371+
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
1372+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13671373
# define SSL_set0_chain(s,sk) \
13681374
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
13691375
# define SSL_set1_chain(s,sk) \
@@ -1386,10 +1392,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13861392
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
13871393
# define SSL_set1_verify_cert_store(s,st) \
13881394
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1395+
#define SSL_get0_verify_cert_store(s,st) \
1396+
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
13891397
# define SSL_set0_chain_cert_store(s,st) \
13901398
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
13911399
# define SSL_set1_chain_cert_store(s,st) \
13921400
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1401+
#define SSL_get0_chain_cert_store(s,st) \
1402+
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
13931403
# define SSL_get1_groups(s, glist) \
13941404
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
13951405
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \

Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.1501</string>
20+
<string>1.1.1700</string>
2121
<key>CFBundleSupportedPlatforms</key>
2222
<array>
2323
<string>MacOSX</string>
@@ -27,7 +27,7 @@
2727
<key>DTCompiler</key>
2828
<string>com.apple.compilers.llvm.clang.1_0</string>
2929
<key>DTPlatformBuild</key>
30-
<string>13F17a</string>
30+
<string>13F100</string>
3131
<key>DTPlatformName</key>
3232
<string>macosx</string>
3333
<key>DTPlatformVersion</key>
@@ -37,9 +37,9 @@
3737
<key>DTSDKName</key>
3838
<string>macosx12.3</string>
3939
<key>DTXcode</key>
40-
<string>1340</string>
40+
<string>1341</string>
4141
<key>DTXcodeBuild</key>
42-
<string>13F17a</string>
42+
<string>13F100</string>
4343
<key>LSMinimumSystemVersion</key>
4444
<string>10.15</string>
4545
<key>UIDeviceFamily</key>

0 commit comments

Comments
 (0)