Changeset View
Changeset View
Standalone View
Standalone View
devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
| --- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2018-09-24 23:51:30 UTC | --- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2020-12-01 19:24:28 UTC | ||||
| +++ src/core/tsi/alts/crypt/aes_gcm.cc | +++ src/core/tsi/alts/crypt/aes_gcm.cc | ||||
| @@ -187,7 +187,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_ | @@ -185,7 +185,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_ | ||||
| const uint8_t* kdf_counter) { | const uint8_t* kdf_counter) { | ||||
| unsigned char buf[EVP_MAX_MD_SIZE]; | unsigned char buf[EVP_MAX_MD_SIZE]; | ||||
| unsigned char ctr = 1; | unsigned char ctr = 1; | ||||
| -#if OPENSSL_VERSION_NUMBER < 0x10100000L | -#if OPENSSL_VERSION_NUMBER < 0x10100000L | ||||
| +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) | +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) | ||||
| HMAC_CTX hmac; | HMAC_CTX hmac; | ||||
| HMAC_CTX_init(&hmac); | HMAC_CTX_init(&hmac); | ||||
| if (!HMAC_Init_ex(&hmac, kdf_key, kKdfKeyLen, EVP_sha256(), nullptr) || | if (!HMAC_Init_ex(&hmac, kdf_key, kKdfKeyLen, EVP_sha256(), nullptr) || | ||||