From 1543c7835a1401d9c67b022a72072d6b3a322cac Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 1 Dec 2017 10:17:50 +0100 Subject: openssl: pkcs12 is supported by boringssl Removes another #ifdef for BoringSSL Pointed-out-by: David Benjamin --- lib/vtls/openssl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 7b04edfd6..d0f525523 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -68,12 +68,7 @@ #include #include #include - -#ifndef OPENSSL_IS_BORINGSSL -/* BoringSSL does not support PKCS12 */ -#define HAVE_PKCS12_SUPPORT 1 #include -#endif #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP) #include @@ -654,7 +649,6 @@ int cert_stuff(struct connectdata *conn, case SSL_FILETYPE_PKCS12: { -#ifdef HAVE_PKCS12_SUPPORT FILE *f; PKCS12 *p12; EVP_PKEY *pri; @@ -741,10 +735,6 @@ int cert_stuff(struct connectdata *conn, if(!cert_done) return 0; /* failure! */ break; -#else - failf(data, "file type P12 for certificate not supported"); - return 0; -#endif } default: failf(data, "not supported file type '%s' for certificate", cert_type); -- cgit v1.2.1