mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 00:57:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: generate-certificates for BoringSSL

Browse Source
This commit is contained in:
Emmanuel Hocdet 2018-10-01 18:45:19 +02:00 committed by Christopher Faulet
parent a9b84028e6
commit 747ca61693
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/openssl-compat.h
View File

@ -153,7 +153,6 @@ static inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x)
#endif #endif
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
#define SSL_NO_GENERATE_CERTIFICATES
static inline int EVP_PKEY_base_id(EVP_PKEY *pkey) static inline int EVP_PKEY_base_id(EVP_PKEY *pkey)
{ {

2
src/ssl_sock.c
View File

@ -1753,7 +1753,7 @@ ssl_sock_do_create_cert(const char *servername, struct bind_conf *bind_conf, SSL
else if (key_type == EVP_PKEY_EC) else if (key_type == EVP_PKEY_EC)
digest = EVP_sha256(); digest = EVP_sha256();
else { else {
#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) #if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) && !defined(OPENSSL_IS_BORINGSSL)
int nid; int nid;
if (EVP_PKEY_get_default_digest_nid(capkey, &nid) <= 0) if (EVP_PKEY_get_default_digest_nid(capkey, &nid) <= 0)