diff options
| author | robot-contrib <robot-contrib@yandex-team.com> | 2022-12-29 11:19:28 +0300 |
|---|---|---|
| committer | robot-contrib <robot-contrib@yandex-team.com> | 2022-12-29 11:19:28 +0300 |
| commit | fed8d432668e1993b6d0d429398d65aa40f3f5fe (patch) | |
| tree | 5b837c62d01f3fcdafb6a31ae4914f530053c5b9 /contrib/restricted/aws/s2n/crypto/s2n_openssl.h | |
| parent | d6e1a495bd3ea25012ef907b23327e085f36be1c (diff) | |
| download | ydb-fed8d432668e1993b6d0d429398d65aa40f3f5fe.tar.gz | |
Update contrib/restricted/aws/s2n to 1.3.31
Diffstat (limited to 'contrib/restricted/aws/s2n/crypto/s2n_openssl.h')
| -rw-r--r-- | contrib/restricted/aws/s2n/crypto/s2n_openssl.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_openssl.h b/contrib/restricted/aws/s2n/crypto/s2n_openssl.h index d0d2b2d2b2..39ff57f6aa 100644 --- a/contrib/restricted/aws/s2n/crypto/s2n_openssl.h +++ b/contrib/restricted/aws/s2n/crypto/s2n_openssl.h @@ -24,12 +24,12 @@ * https://github.com/aws/aws-sdk-cpp/pull/507/commits/2c99f1fe0c4b4683280caeb161538d4724d6a179 */ #if defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x20000000L) -#undef OPENSSL_VERSION_NUMBER -#if LIBRESSL_VERSION_NUMBER < 0x3050000fL -#define OPENSSL_VERSION_NUMBER 0x1000107fL -#else -#define OPENSSL_VERSION_NUMBER 0x1010000fL -#endif + #undef OPENSSL_VERSION_NUMBER + #if LIBRESSL_VERSION_NUMBER < 0x3050000fL + #define OPENSSL_VERSION_NUMBER 0x1000107fL + #else + #define OPENSSL_VERSION_NUMBER 0x1010000fL + #endif #endif /* Per https://wiki.openssl.org/index.php/Manual:OPENSSL_VERSION_NUMBER(3) @@ -43,17 +43,17 @@ (OPENSSL_VERSION_NUMBER >= ((major << 28) + (minor << 20) + (fix << 12))) #if (S2N_OPENSSL_VERSION_AT_LEAST(1, 1, 0)) && (!defined(OPENSSL_IS_BORINGSSL)) && (!defined(OPENSSL_IS_AWSLC)) && (!defined(LIBRESSL_VERSION_NUMBER)) -#define s2n_evp_ctx_init(ctx) POSIX_GUARD_OSSL(EVP_CIPHER_CTX_init(ctx), S2N_ERR_DRBG) -#define RESULT_EVP_CTX_INIT(ctx) RESULT_GUARD_OSSL(EVP_CIPHER_CTX_init(ctx), S2N_ERR_DRBG) + #define s2n_evp_ctx_init(ctx) POSIX_GUARD_OSSL(EVP_CIPHER_CTX_init(ctx), S2N_ERR_DRBG) + #define RESULT_EVP_CTX_INIT(ctx) RESULT_GUARD_OSSL(EVP_CIPHER_CTX_init(ctx), S2N_ERR_DRBG) #else -#define s2n_evp_ctx_init(ctx) EVP_CIPHER_CTX_init(ctx) -#define RESULT_EVP_CTX_INIT(ctx) EVP_CIPHER_CTX_init(ctx) + #define s2n_evp_ctx_init(ctx) EVP_CIPHER_CTX_init(ctx) + #define RESULT_EVP_CTX_INIT(ctx) EVP_CIPHER_CTX_init(ctx) #endif #if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_FIPS) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_IS_AWSLC) && !defined(OPENSSL_NO_ENGINE) -#define S2N_LIBCRYPTO_SUPPORTS_CUSTOM_RAND 1 + #define S2N_LIBCRYPTO_SUPPORTS_CUSTOM_RAND 1 #else -#define S2N_LIBCRYPTO_SUPPORTS_CUSTOM_RAND 0 + #define S2N_LIBCRYPTO_SUPPORTS_CUSTOM_RAND 0 #endif bool s2n_libcrypto_is_awslc(); |