Skip to content

Commit

Permalink
3.1.3001 hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
@krzyzanowskim
krzyzanowskim committed Sep 29, 2023
1 parent ce8d8ad commit 5ae21d0
Show file tree
Hide file tree
Showing 166 changed files with 43,425 additions and 28 deletions.
34 changes: 24 additions & 10 deletions Frameworks/OpenSSL.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<array>
<dict>
<key>BinaryPath</key>
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
<string>OpenSSL.framework/OpenSSL</string>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>OpenSSL.framework</string>
<key>SupportedArchitectures</key>
Expand All @@ -17,13 +17,15 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>OpenSSL.framework/OpenSSL</string>
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>OpenSSL.framework</string>
<key>SupportedArchitectures</key>
Expand All @@ -34,13 +36,27 @@
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>maccatalyst</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>OpenSSL.framework/OpenSSL</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>OpenSSL.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>OpenSSL.framework/Versions/A/OpenSSL</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>OpenSSL.framework</string>
<key>SupportedArchitectures</key>
Expand All @@ -49,9 +65,7 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
140 changes: 140 additions & 0 deletions Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/OpenSSL.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
// ls -1 ../../iphoneos/include/openssl | sed 's/\(.*\)/\#include \<OpenSSL\/\1\>/'
// Include before others:
#include <OpenSSL/ssl.h>

#include <OpenSSL/ssl2.h>
#include <OpenSSL/ssl3.h>
#include <OpenSSL/sslerr.h>

#include <OpenSSL/aes.h>
#include <OpenSSL/asn1.h>
// #include <OpenSSL/asn1_mac.h>
#include <OpenSSL/asn1err.h>
#include <OpenSSL/asn1t.h>
#include <OpenSSL/async.h>
#include <OpenSSL/asyncerr.h>
#include <OpenSSL/bio.h>
#include <OpenSSL/bioerr.h>
#include <OpenSSL/blowfish.h>
#include <OpenSSL/bn.h>
#include <OpenSSL/bnerr.h>
#include <OpenSSL/buffer.h>
#include <OpenSSL/buffererr.h>
#include <OpenSSL/camellia.h>
#include <OpenSSL/cast.h>
#include <OpenSSL/cmac.h>
#include <OpenSSL/cmp.h>
#include <OpenSSL/cmp_util.h>
#include <OpenSSL/cmperr.h>
#include <OpenSSL/cms.h>
#include <OpenSSL/cmserr.h>
#include <OpenSSL/comp.h>
#include <OpenSSL/comperr.h>
#include <OpenSSL/conf.h>
#include <OpenSSL/conf_api.h>
#include <OpenSSL/conferr.h>
#include <OpenSSL/configuration.h>
#include <OpenSSL/conftypes.h>
#include <OpenSSL/core.h>
#include <OpenSSL/core_dispatch.h>
#include <OpenSSL/core_names.h>
#include <OpenSSL/core_object.h>
#include <OpenSSL/crmf.h>
#include <OpenSSL/crmferr.h>
#include <OpenSSL/crypto.h>
#include <OpenSSL/cryptoerr.h>
#include <OpenSSL/cryptoerr_legacy.h>
#include <OpenSSL/ct.h>
#include <OpenSSL/cterr.h>
#include <OpenSSL/decoder.h>
#include <OpenSSL/decodererr.h>
#include <OpenSSL/des.h>
#include <OpenSSL/dh.h>
#include <OpenSSL/dherr.h>
#include <OpenSSL/dsa.h>
#include <OpenSSL/dsaerr.h>
#include <OpenSSL/dtls1.h>
#include <OpenSSL/e_os2.h>
#include <OpenSSL/ebcdic.h>
#include <OpenSSL/ec.h>
#include <OpenSSL/ecdh.h>
#include <OpenSSL/ecdsa.h>
#include <OpenSSL/ecerr.h>
#include <OpenSSL/encoder.h>
#include <OpenSSL/encodererr.h>
#include <OpenSSL/engine.h>
#include <OpenSSL/engineerr.h>
#include <OpenSSL/err.h>
#include <OpenSSL/ess.h>
#include <OpenSSL/esserr.h>
#include <OpenSSL/evp.h>
#include <OpenSSL/evperr.h>
#include <OpenSSL/fips_names.h>
#include <OpenSSL/fipskey.h>
#include <OpenSSL/hmac.h>
#include <OpenSSL/http.h>
#include <OpenSSL/httperr.h>
#include <OpenSSL/idea.h>
#include <OpenSSL/kdf.h>
#include <OpenSSL/kdferr.h>
#include <OpenSSL/lhash.h>
#include <OpenSSL/macros.h>
#include <OpenSSL/md2.h>
#include <OpenSSL/md4.h>
#include <OpenSSL/md5.h>
#include <OpenSSL/mdc2.h>
#include <OpenSSL/modes.h>
#include <OpenSSL/obj_mac.h>
#include <OpenSSL/objects.h>
#include <OpenSSL/objectserr.h>
#include <OpenSSL/ocsp.h>
#include <OpenSSL/ocsperr.h>
#include <OpenSSL/opensslconf.h>
#include <OpenSSL/opensslv.h>
#include <OpenSSL/ossl_typ.h>
#include <OpenSSL/param_build.h>
#include <OpenSSL/params.h>
#include <OpenSSL/pem.h>
#include <OpenSSL/pem2.h>
#include <OpenSSL/pemerr.h>
#include <OpenSSL/pkcs12.h>
#include <OpenSSL/pkcs12err.h>
#include <OpenSSL/pkcs7.h>
#include <OpenSSL/pkcs7err.h>
#include <OpenSSL/prov_ssl.h>
#include <OpenSSL/proverr.h>
#include <OpenSSL/provider.h>
#include <OpenSSL/rand.h>
#include <OpenSSL/randerr.h>
#include <OpenSSL/rc2.h>
#include <OpenSSL/rc4.h>
#include <OpenSSL/rc5.h>
#include <OpenSSL/ripemd.h>
#include <OpenSSL/rsa.h>
#include <OpenSSL/rsaerr.h>
#include <OpenSSL/safestack.h>
#include <OpenSSL/seed.h>
#include <OpenSSL/self_test.h>
#include <OpenSSL/sha.h>
#include <OpenSSL/shim.h>
#include <OpenSSL/srp.h>
#include <OpenSSL/srtp.h>
#include <OpenSSL/sslerr_legacy.h>
#include <OpenSSL/stack.h>
#include <OpenSSL/store.h>
#include <OpenSSL/storeerr.h>
#include <OpenSSL/symhacks.h>
#include <OpenSSL/tls1.h>
#include <OpenSSL/trace.h>
#include <OpenSSL/ts.h>
#include <OpenSSL/tserr.h>
#include <OpenSSL/txt_db.h>
#include <OpenSSL/types.h>
#include <OpenSSL/ui.h>
#include <OpenSSL/uierr.h>
#include <OpenSSL/whrlpool.h>
#include <OpenSSL/x509.h>
#include <OpenSSL/x509_vfy.h>
#include <OpenSSL/x509err.h>
#include <OpenSSL/x509v3.h>
#include <OpenSSL/x509v3err.h>
111 changes: 111 additions & 0 deletions Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/aes.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/*
* Copyright 2002-2020 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
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/

#ifndef OPENSSL_AES_H
# define OPENSSL_AES_H
# pragma once

#include <OpenSSL/macros.h>
# ifndef OPENSSL_NO_DEPRECATED_3_0
# define HEADER_AES_H
# endif

#include <OpenSSL/opensslconf.h>

# include <stddef.h>
# ifdef __cplusplus
extern "C" {
# endif

# define AES_BLOCK_SIZE 16

# ifndef OPENSSL_NO_DEPRECATED_3_0

# define AES_ENCRYPT 1
# define AES_DECRYPT 0

# define AES_MAXNR 14


/* This should be a hidden type, but EVP requires that the size be known */
struct aes_key_st {
# ifdef AES_LONG
unsigned long rd_key[4 * (AES_MAXNR + 1)];
# else
unsigned int rd_key[4 * (AES_MAXNR + 1)];
# endif
int rounds;
};
typedef struct aes_key_st AES_KEY;

# endif
# ifndef OPENSSL_NO_DEPRECATED_3_0
OSSL_DEPRECATEDIN_3_0 const char *AES_options(void);
OSSL_DEPRECATEDIN_3_0
int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key);
OSSL_DEPRECATEDIN_3_0
int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key);
OSSL_DEPRECATEDIN_3_0
void AES_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key);
OSSL_DEPRECATEDIN_3_0
void AES_decrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key);
OSSL_DEPRECATEDIN_3_0
void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key, const int enc);
OSSL_DEPRECATEDIN_3_0
void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, const int enc);
OSSL_DEPRECATEDIN_3_0
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc);
OSSL_DEPRECATEDIN_3_0
void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc);
OSSL_DEPRECATEDIN_3_0
void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, int *num, const int enc);
OSSL_DEPRECATEDIN_3_0
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, int *num);

/* NB: the IV is _two_ blocks long */
OSSL_DEPRECATEDIN_3_0
void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key,
unsigned char *ivec, const int enc);
/* NB: the IV is _four_ blocks long */
OSSL_DEPRECATEDIN_3_0
void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const AES_KEY *key, const AES_KEY *key2,
const unsigned char *ivec, const int enc);
OSSL_DEPRECATEDIN_3_0
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
unsigned char *out, const unsigned char *in,
unsigned int inlen);
OSSL_DEPRECATEDIN_3_0
int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
unsigned char *out, const unsigned char *in,
unsigned int inlen);
# endif


# ifdef __cplusplus
}
# endif

#endif
Loading

0 comments on commit 5ae21d0

Please sign in to comment.