]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: guard EVP_PKEY_get_default_digest_nid with ASN1_PKEY_CTRL_DEFAULT_MD_NID
authorIlya Shipitsin <chipitsine@gmail.com>
Thu, 7 Jan 2021 06:57:42 +0000 (11:57 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Thu, 7 Jan 2021 09:20:00 +0000 (10:20 +0100)
let us switch to openssl specific macro instead of versions

src/ssl_sock.c

index 830dc3e69817c9fea4612a51a8a5e45985074f19..587140f1bbe8c6847d863564a59d4beffedc4b2a 100644 (file)
@@ -2001,7 +2001,7 @@ ssl_sock_do_create_cert(const char *servername, struct bind_conf *bind_conf, SSL
        else if (key_type == EVP_PKEY_EC)
                digest = EVP_sha256();
        else {
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000000fL) && !defined(OPENSSL_IS_BORINGSSL)
+#ifdef ASN1_PKEY_CTRL_DEFAULT_MD_NID
                int nid;
 
                if (EVP_PKEY_get_default_digest_nid(capkey, &nid) <= 0)