diff options
| author | Jack Lloyd <[email protected]> | 2018-11-08 11:05:47 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-11-08 11:05:47 -0500 |
| commit | 3cfda05c6a2d63bd21ffc0acad35938aa8284d8a (patch) | |
| tree | 04351b8268971e044f9a79045f36312a4033ce7a /src/lib | |
| parent | 5c5eea40fd8d9900c8de170505086dce9d0389c6 (diff) | |
| parent | 4494130d96ccce66b169d665b0902faf072fabc6 (diff) | |
Merge GH #1735 Use OpenSSL 1.1 API with LibreSSL
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/prov/openssl/openssl_ec.cpp | 4 | ||||
| -rw-r--r-- | src/lib/prov/openssl/openssl_hash.cpp | 4 | ||||
| -rw-r--r-- | src/lib/prov/openssl/openssl_rsa.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/prov/openssl/openssl_ec.cpp b/src/lib/prov/openssl/openssl_ec.cpp index 5018bb027..e044d552a 100644 --- a/src/lib/prov/openssl/openssl_ec.cpp +++ b/src/lib/prov/openssl/openssl_ec.cpp @@ -171,7 +171,7 @@ class OpenSSL_ECDSA_Verification_Operation final : public PK_Ops::Verification_w std::unique_ptr<ECDSA_SIG, std::function<void (ECDSA_SIG*)>> sig(nullptr, ECDSA_SIG_free); sig.reset(::ECDSA_SIG_new()); -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L sig->r = BN_bin2bn(sig_bytes , sig_len / 2, sig->r); sig->s = BN_bin2bn(sig_bytes + sig_len / 2, sig_len / 2, sig->s); #else @@ -243,7 +243,7 @@ class OpenSSL_ECDSA_Signing_Operation final : public PK_Ops::Signature_with_EMSA if(!sig) throw OpenSSL_Error("ECDSA_do_sign"); -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L const BIGNUM* r = sig->r; const BIGNUM* s = sig->s; #else diff --git a/src/lib/prov/openssl/openssl_hash.cpp b/src/lib/prov/openssl/openssl_hash.cpp index b0af07e24..1f4da0484 100644 --- a/src/lib/prov/openssl/openssl_hash.cpp +++ b/src/lib/prov/openssl/openssl_hash.cpp @@ -52,7 +52,7 @@ class OpenSSL_HashFunction final : public HashFunction OpenSSL_HashFunction(const std::string& name, const EVP_MD* md) : m_name(name) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L m_md = EVP_MD_CTX_create(); #else m_md = EVP_MD_CTX_new(); @@ -71,7 +71,7 @@ class OpenSSL_HashFunction final : public HashFunction ~OpenSSL_HashFunction() { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L EVP_MD_CTX_destroy(m_md); #else EVP_MD_CTX_free(m_md); diff --git a/src/lib/prov/openssl/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp index 8108526a1..98c0734a8 100644 --- a/src/lib/prov/openssl/openssl_rsa.cpp +++ b/src/lib/prov/openssl/openssl_rsa.cpp @@ -160,7 +160,7 @@ class OpenSSL_RSA_Verification_Operation final : public PK_Ops::Verification_wit size_t max_input_bits() const override { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L return ::BN_num_bits(m_openssl_rsa->n) - 1; #else return ::RSA_bits(m_openssl_rsa.get()) - 1; @@ -234,7 +234,7 @@ class OpenSSL_RSA_Signing_Operation final : public PK_Ops::Signature_with_EMSA size_t max_input_bits() const override { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L return ::BN_num_bits(m_openssl_rsa->n) - 1; #else return ::RSA_bits(m_openssl_rsa.get()) - 1; |