summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-12-01 10:17:50 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-12-02 11:55:01 +0100
commit10bb0b47197588f2491a16996ae3d95e37a4ee20 (patch)
tree12303b43a8045c5a2a0571fdf2d63d59d03d264b
parent8eff32f0bf8bbcfaf34b8b78f268321d0446caee (diff)
downloadcurl-10bb0b47197588f2491a16996ae3d95e37a4ee20.tar.gz
openssl: pkcs12 is supported by boringssl
Removes another #ifdef for BoringSSL Pointed-out-by: David Benjamin Closes #2134
-rw-r--r--lib/vtls/openssl.c10
1 files changed, 0 insertions, 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 <openssl/rsa.h>
#include <openssl/bio.h>
#include <openssl/buffer.h>
-
-#ifndef OPENSSL_IS_BORINGSSL
-/* BoringSSL does not support PKCS12 */
-#define HAVE_PKCS12_SUPPORT 1
#include <openssl/pkcs12.h>
-#endif
#if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP)
#include <openssl/ocsp.h>
@@ -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);