OpenSSL 3.1.4

krzyzanowskim · Nov 15, 2023 · 2fec233 · 2fec233
1 parent 5ae21d0
commit 2fec233
Show file tree

Hide file tree

Showing 122 changed files with 530 additions and 265 deletions.
diff --git a/Frameworks/OpenSSL.xcframework/Info.plist b/Frameworks/OpenSSL.xcframework/Info.plist
@@ -8,18 +8,15 @@
 			<key>BinaryPath</key>
 			<string>OpenSSL.framework/OpenSSL</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OpenSSL.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -42,15 +39,18 @@
 			<key>BinaryPath</key>
 			<string>OpenSSL.framework/OpenSSL</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OpenSSL.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmserr.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -113,6 +113,7 @@
 #  define CMS_R_UNSUPPORTED_LABEL_SOURCE                   193
 #  define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE             155
 #  define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
+#  define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM            195
 #  define CMS_R_UNSUPPORTED_TYPE                           156
 #  define CMS_R_UNWRAP_ERROR                               157
 #  define CMS_R_UNWRAP_FAILURE                             180

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -176,6 +176,12 @@ OSSL_CORE_MAKE_FUNC(int, BIO_vsnprintf,
 OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO *bio,
                                     int cmd, long num, void *ptr))
 
+/* New seeding functions prototypes with the 101-104 series */
+#define OSSL_FUNC_CLEANUP_USER_ENTROPY        96
+#define OSSL_FUNC_CLEANUP_USER_NONCE          97
+#define OSSL_FUNC_GET_USER_ENTROPY            98
+#define OSSL_FUNC_GET_USER_NONCE              99
+
 #define OSSL_FUNC_SELF_TEST_CB               100
 OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **cb,
                                          void **cbarg))
@@ -188,14 +194,25 @@ OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **
 OSSL_CORE_MAKE_FUNC(size_t, get_entropy, (const OSSL_CORE_HANDLE *handle,
                                           unsigned char **pout, int entropy,
                                           size_t min_len, size_t max_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_entropy, (const OSSL_CORE_HANDLE *handle,
+                                               unsigned char **pout, int entropy,
+                                               size_t min_len, size_t max_len))
 OSSL_CORE_MAKE_FUNC(void, cleanup_entropy, (const OSSL_CORE_HANDLE *handle,
                                             unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_entropy, (const OSSL_CORE_HANDLE *handle,
+                                                 unsigned char *buf, size_t len))
 OSSL_CORE_MAKE_FUNC(size_t, get_nonce, (const OSSL_CORE_HANDLE *handle,
                                         unsigned char **pout, size_t min_len,
                                         size_t max_len, const void *salt,
                                         size_t salt_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_nonce, (const OSSL_CORE_HANDLE *handle,
+                                             unsigned char **pout, size_t min_len,
+                                             size_t max_len, const void *salt,
+                                             size_t salt_len))
 OSSL_CORE_MAKE_FUNC(void, cleanup_nonce, (const OSSL_CORE_HANDLE *handle,
                                           unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_nonce, (const OSSL_CORE_HANDLE *handle,
+                                               unsigned char *buf, size_t len))
 
 /* Functions to access the core's providers */
 #define OSSL_FUNC_PROVIDER_REGISTER_CHILD_CB   105

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h
@@ -248,6 +248,7 @@ extern "C" {
 #define OSSL_RAND_PARAM_MAX_REQUEST             "max_request"
 #define OSSL_RAND_PARAM_TEST_ENTROPY            "test_entropy"
 #define OSSL_RAND_PARAM_TEST_NONCE              "test_nonce"
+#define OSSL_RAND_PARAM_GENERATE                "generate"
 
 /* RAND/DRBG names */
 #define OSSL_DRBG_PARAM_RESEED_REQUESTS         "reseed_requests"

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -85,6 +85,8 @@
 /* Easy to use macros for EVP_PKEY related selections */
 # define EVP_PKEY_KEY_PARAMETERS                                            \
     ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS )
+# define EVP_PKEY_PRIVATE_KEY                                               \
+    ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PRIVATE_KEY )
 # define EVP_PKEY_PUBLIC_KEY                                                \
     ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PUBLIC_KEY )
 # define EVP_PKEY_KEYPAIR                                                   \

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  1
-# define OPENSSL_VERSION_PATCH  3
+# define OPENSSL_VERSION_PATCH  4
 
 /*
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
-# define OPENSSL_VERSION_STR "3.1.3"
-# define OPENSSL_FULL_VERSION_STR "3.1.3"
+# define OPENSSL_VERSION_STR "3.1.4"
+# define OPENSSL_FULL_VERSION_STR "3.1.4"
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
-# define OPENSSL_RELEASE_DATE "19 Sep 2023"
+# define OPENSSL_RELEASE_DATE "24 Oct 2023"
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.3 19 Sep 2023"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.1.4 24 Oct 2023"
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from include/openssl/pkcs7.h.in
  *
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -59,8 +59,8 @@ typedef struct pkcs7_signer_info_st {
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *digest_alg;
     STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
+    X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */
+    ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */
     STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
     /* The private key to sign with */
     EVP_PKEY *pkey;

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/randerr.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/randerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -41,6 +41,7 @@
 # define RAND_R_GENERATE_ERROR                            112
 # define RAND_R_INSUFFICIENT_DRBG_STRENGTH                139
 # define RAND_R_INTERNAL_ERROR                            113
+# define RAND_R_INVALID_PROPERTY_QUERY                    137
 # define RAND_R_IN_ERROR_STATE                            114
 # define RAND_R_NOT_A_REGULAR_FILE                        122
 # define RAND_R_NOT_INSTANTIATED                          115

diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources
@@ -90,7 +90,7 @@
 		</data>
 		<key>Headers/cmserr.h</key>
 		<data>
-		GxDMoz+KqfMHmjhTkc/bND68zgI=
+		9PWAHMeOBWQ2CxTQ5KA3KjXKWiM=
 		</data>
 		<key>Headers/comp.h</key>
 		<data>
@@ -126,11 +126,11 @@
 		</data>
 		<key>Headers/core_dispatch.h</key>
 		<data>
-		VvME8oei21eX7HUzLKBONuRHqNM=
+		zUi9uRmH2QVO4Mxx9idYALHrvAw=
 		</data>
 		<key>Headers/core_names.h</key>
 		<data>
-		yPxCusucjbBobLAghFGS6zOK56g=
+		S8V+aIQDB6zZ3kSWyKkxLWKw2T0=
 		</data>
 		<key>Headers/core_object.h</key>
 		<data>
@@ -250,7 +250,7 @@
 		</data>
 		<key>Headers/evp.h</key>
 		<data>
-		v2XRTrJ1YDQ28KhPy2N6LitYIFk=
+		xfiJMp65BDUi3aXZvvuZrt7L9+0=
 		</data>
 		<key>Headers/evperr.h</key>
 		<data>
@@ -342,7 +342,7 @@
 		</data>
 		<key>Headers/opensslv.h</key>
 		<data>
-		B8jkPUquY0xk+VyMJiV3WkHrgkM=
+		QaAH5vCG92hXl7SUYvylK0+OVHg=
 		</data>
 		<key>Headers/ossl_typ.h</key>
 		<data>
@@ -378,7 +378,7 @@
 		</data>
 		<key>Headers/pkcs7.h</key>
 		<data>
-		VM5oJ7U+A8P8eOYZcDOwSURQfA8=
+		ZqxUH9dDx5G9bVIa5S5xzCbvcNc=
 		</data>
 		<key>Headers/pkcs7err.h</key>
 		<data>
@@ -402,7 +402,7 @@
 		</data>
 		<key>Headers/randerr.h</key>
 		<data>
-		0O58Htj1cVoNdBF6yF0kZaquyQc=
+		Xe8MjXWyx3uEdOEpQe3PZvE4O4U=
 		</data>
 		<key>Headers/rc2.h</key>
 		<data>
@@ -550,7 +550,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		oVBJvpH10IDHwCuriAMcUvtAXUI=
+		iV2fAOIHnLN19zg4AkCYQqg5wdY=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -710,7 +710,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			VDU0WPiv2EK98G+FxeISLpgeUQAHCTKGLSaQS/BHTPs=
+			Cd910K/W2zzd7MQZY+jt+tjb2M/2wH4sT/3l87ZQ1EU=
 			</data>
 		</dict>
 		<key>Headers/comp.h</key>
@@ -773,14 +773,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			KiaOx/xriLyfTCOUINvtB4xn2EOfKBAtdUUfuedpoa8=
+			F61p2+xD/4Alrb0VDoRuyRk1LAFkrWtW3G1jKklsRKw=
 			</data>
 		</dict>
 		<key>Headers/core_names.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Mju4504QvwWMQOwwQ9H/tUJ6mVxt32j2YC/DFLvZ3+E=
+			FOH+hNIzd5OayM9I499Mh0Obu2Ji9DTwlHgb8E6dtBA=
 			</data>
 		</dict>
 		<key>Headers/core_object.h</key>
@@ -990,7 +990,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			0ZvN+Ahp96Yx2roqSQDEmuuT795oalF3/wRtoPai7Xs=
+			RNLwSx5MNzfH0ejqFXfUGpphkSuqff35suWkWFMgd7I=
 			</data>
 		</dict>
 		<key>Headers/evperr.h</key>
@@ -1151,7 +1151,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			H1U8cM+Qb/tdkliK98cfGEJ8C9VCuaq++7YmW4muGPk=
+			cNLcoaCKtgrxuI9cj2AdsbXldNyLqpydGtlXkDtjd3k=
 			</data>
 		</dict>
 		<key>Headers/ossl_typ.h</key>
@@ -1214,7 +1214,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			ZO1kFbXdrqnIPI7U0VD5bRFXk5Rv8p1/d+25X4hO4jI=
+			mBw6EbUTC/uqy8CJWYp1uM5ZaF2X8c0J3a83+6NNJqY=
 			</data>
 		</dict>
 		<key>Headers/pkcs7err.h</key>
@@ -1256,7 +1256,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			cGPJb57JfeQ1fAFR42c9D9vqQ7dBDeQVRJS+1lkVEUk=
+			2sIfVI1ju4SMmNXJEUJ/R4FWNU4e4omvSYdvbOvsrTo=
 			</data>
 		</dict>
 		<key>Headers/rc2.h</key>

diff --git a/...SL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmserr.h b/...SL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -113,6 +113,7 @@
 #  define CMS_R_UNSUPPORTED_LABEL_SOURCE                   193
 #  define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE             155
 #  define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
+#  define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM            195
 #  define CMS_R_UNSUPPORTED_TYPE                           156
 #  define CMS_R_UNWRAP_ERROR                               157
 #  define CMS_R_UNWRAP_FAILURE                             180

diff --git a/...amework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h b/...amework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -176,6 +176,12 @@ OSSL_CORE_MAKE_FUNC(int, BIO_vsnprintf,
 OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO *bio,
                                     int cmd, long num, void *ptr))
 
+/* New seeding functions prototypes with the 101-104 series */
+#define OSSL_FUNC_CLEANUP_USER_ENTROPY        96
+#define OSSL_FUNC_CLEANUP_USER_NONCE          97
+#define OSSL_FUNC_GET_USER_ENTROPY            98
+#define OSSL_FUNC_GET_USER_NONCE              99
+
 #define OSSL_FUNC_SELF_TEST_CB               100
 OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **cb,
                                          void **cbarg))
@@ -188,14 +194,25 @@ OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **
 OSSL_CORE_MAKE_FUNC(size_t, get_entropy, (const OSSL_CORE_HANDLE *handle,
                                           unsigned char **pout, int entropy,
                                           size_t min_len, size_t max_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_entropy, (const OSSL_CORE_HANDLE *handle,
+                                               unsigned char **pout, int entropy,
+                                               size_t min_len, size_t max_len))
 OSSL_CORE_MAKE_FUNC(void, cleanup_entropy, (const OSSL_CORE_HANDLE *handle,
                                             unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_entropy, (const OSSL_CORE_HANDLE *handle,
+                                                 unsigned char *buf, size_t len))
 OSSL_CORE_MAKE_FUNC(size_t, get_nonce, (const OSSL_CORE_HANDLE *handle,
                                         unsigned char **pout, size_t min_len,
                                         size_t max_len, const void *salt,
                                         size_t salt_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_nonce, (const OSSL_CORE_HANDLE *handle,
+                                             unsigned char **pout, size_t min_len,
+                                             size_t max_len, const void *salt,
+                                             size_t salt_len))
 OSSL_CORE_MAKE_FUNC(void, cleanup_nonce, (const OSSL_CORE_HANDLE *handle,
                                           unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_nonce, (const OSSL_CORE_HANDLE *handle,
+                                               unsigned char *buf, size_t len))
 
 /* Functions to access the core's providers */
 #define OSSL_FUNC_PROVIDER_REGISTER_CHILD_CB   105

diff --git a/...cframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h b/...cframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
@@ -248,6 +248,7 @@ extern "C" {
 #define OSSL_RAND_PARAM_MAX_REQUEST             "max_request"
 #define OSSL_RAND_PARAM_TEST_ENTROPY            "test_entropy"
 #define OSSL_RAND_PARAM_TEST_NONCE              "test_nonce"
+#define OSSL_RAND_PARAM_GENERATE                "generate"
 
 /* RAND/DRBG names */
 #define OSSL_DRBG_PARAM_RESEED_REQUESTS         "reseed_requests"