denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Improve compatibility to newer BoringSSL releases

Browse Source 
Closes strongswan/strongswan#352
This commit is contained in:
Tobias Brunner
2021-08-24 14:20:37 +02:00
parent 1d64b6c462
commit 57e68ab9c5
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
+2 -1
View File
@@ -168,7 +168,8 @@ static status_t set_modulus(private_openssl_diffie_hellman_t *this)
} }
if (params->exp_len != params->prime.len) if (params->exp_len != params->prime.len)
{ {
#ifdef OPENSSL_IS_BORINGSSL #if defined(OPENSSL_IS_BORINGSSL) && \
(!defined(BORINGSSL_API_VERSION) || BORINGSSL_API_VERSION < 11)
this->dh->priv_length = params->exp_len * 8; this->dh->priv_length = params->exp_len * 8;
#else #else
if (!DH_set_length(this->dh, params->exp_len * 8)) if (!DH_set_length(this->dh, params->exp_len * 8))
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+4 -4
View File
@@ -21,7 +21,7 @@
#include <openssl/ec.h> #include <openssl/ec.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER < 0x1010000fL
#include <openssl/bn.h> #include <openssl/bn.h>
#endif #endif
@@ -67,7 +67,7 @@ struct private_openssl_ec_diffie_hellman_t {
bool computed; bool computed;
}; };
#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER < 0x1010000fL
/** /**
* Convert a chunk to an EC_POINT and set it on the given key. The x and y * Convert a chunk to an EC_POINT and set it on the given key. The x and y
* coordinates of the point have to be concatenated in the chunk. * coordinates of the point have to be concatenated in the chunk.
@@ -202,7 +202,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
goto error; goto error;
} }
#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER < 0x1010000fL
if (!chunk2ecp(this->ec_group, value, pub)) if (!chunk2ecp(this->ec_group, value, pub))
{ {
DBG1(DBG_LIB, "ECDH public value is malformed"); DBG1(DBG_LIB, "ECDH public value is malformed");
@@ -235,7 +235,7 @@ error:
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(diffie_hellman_t, get_my_public_value, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t *value) private_openssl_ec_diffie_hellman_t *this, chunk_t *value)
{ {
#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER < 0x1010000fL
return ecp2chunk(this->ec_group, this->key, value); return ecp2chunk(this->ec_group, this->key, value);
#else #else
chunk_t pub; chunk_t pub;
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
+1 -1
View File
@@ -279,7 +279,7 @@ METHOD(private_key_t, sign, bool,
return build_emsa_pkcs1_signature(this, NID_sha384, data, signature); return build_emsa_pkcs1_signature(this, NID_sha384, data, signature);
case SIGN_RSA_EMSA_PKCS1_SHA2_512: case SIGN_RSA_EMSA_PKCS1_SHA2_512:
return build_emsa_pkcs1_signature(this, NID_sha512, data, signature); return build_emsa_pkcs1_signature(this, NID_sha512, data, signature);
#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3)
case SIGN_RSA_EMSA_PKCS1_SHA3_224: case SIGN_RSA_EMSA_PKCS1_SHA3_224:
return build_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); return build_emsa_pkcs1_signature(this, NID_sha3_224, data, signature);
case SIGN_RSA_EMSA_PKCS1_SHA3_256: case SIGN_RSA_EMSA_PKCS1_SHA3_256:
src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
+1 -1
View File
@@ -280,7 +280,7 @@ METHOD(public_key_t, verify, bool,
return verify_emsa_pkcs1_signature(this, NID_sha384, data, signature); return verify_emsa_pkcs1_signature(this, NID_sha384, data, signature);
case SIGN_RSA_EMSA_PKCS1_SHA2_512: case SIGN_RSA_EMSA_PKCS1_SHA2_512:
return verify_emsa_pkcs1_signature(this, NID_sha512, data, signature); return verify_emsa_pkcs1_signature(this, NID_sha512, data, signature);
#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(OPENSSL_IS_BORINGSSL) #if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3)
case SIGN_RSA_EMSA_PKCS1_SHA3_224: case SIGN_RSA_EMSA_PKCS1_SHA3_224:
return verify_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); return verify_emsa_pkcs1_signature(this, NID_sha3_224, data, signature);
case SIGN_RSA_EMSA_PKCS1_SHA3_256: case SIGN_RSA_EMSA_PKCS1_SHA3_256:
src/libstrongswan/plugins/openssl/openssl_util.h
+6 -1
View File
@@ -153,10 +153,15 @@ time_t openssl_asn1_to_time(const ASN1_TIME *time);
/** /**
* Compatibility macros * Compatibility macros
*/ */
#ifdef OPENSSL_IS_BORINGSSL #if defined(OPENSSL_IS_BORINGSSL) && \
(!defined(BORINGSSL_API_VERSION) || BORINGSSL_API_VERSION < 10)
#define EVP_PKEY_base_id(p) EVP_PKEY_type(p->type) #define EVP_PKEY_base_id(p) EVP_PKEY_type(p->type)
#endif #endif
#ifndef OPENSSL_INIT_ENGINE_ALL_BUILTIN
#define OPENSSL_INIT_ENGINE_ALL_BUILTIN 0
#endif
/** /**
* Macros to define fallback getters/setters to access keys (BIGNUM*) for types * Macros to define fallback getters/setters to access keys (BIGNUM*) for types
* that were made opaque with OpenSSL 1.1.0. * that were made opaque with OpenSSL 1.1.0.