moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

openssl: pkcs12 is supported by boringssl

Browse Source 
Removes another #ifdef for BoringSSL

Pointed-out-by: David Benjamin

Closes #2134
This commit is contained in:
Daniel Stenberg 2017-12-01 10:17:50 +01:00
parent 8eff32f0bf
commit 10bb0b4719
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vtls/openssl.c
View File

@ -68,12 +68,7 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/buffer.h> #include <openssl/buffer.h>
#ifndef OPENSSL_IS_BORINGSSL
/* BoringSSL does not support PKCS12 */
#define HAVE_PKCS12_SUPPORT 1
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP)
#include <openssl/ocsp.h> #include <openssl/ocsp.h>
@ -654,7 +649,6 @@ int cert_stuff(struct connectdata *conn,
case SSL_FILETYPE_PKCS12: case SSL_FILETYPE_PKCS12:
{ {
#ifdef HAVE_PKCS12_SUPPORT
FILE *f; FILE *f;
PKCS12 *p12; PKCS12 *p12;
EVP_PKEY *pri; EVP_PKEY *pri;
@ -741,10 +735,6 @@ int cert_stuff(struct connectdata *conn,
if(!cert_done) if(!cert_done)
return 0; /* failure! */ return 0; /* failure! */
break; break;
#else
failf(data, "file type P12 for certificate not supported");
return 0;
#endif
} }
default: default:
failf(data, "not supported file type '%s' for certificate", cert_type); failf(data, "not supported file type '%s' for certificate", cert_type);