denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Update PKCS#12 API to OpenSSL 1.1.0

Browse Source
This commit is contained in:
Tobias Brunner
2016-06-29 11:09:37 +02:00
parent a9f388e368
commit 985d7b1c67
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_pkcs12.c
+5 -1
View File
@@ -23,6 +23,10 @@
#include <library.h> #include <library.h>
#include <credentials/sets/mem_cred.h> #include <credentials/sets/mem_cred.h>
#ifdef OPENSSL_IS_BORINGSSL
#define EVP_PKEY_base_id(p) EVP_PKEY_type(p->type)
#endif
typedef struct private_pkcs12_t private_pkcs12_t; typedef struct private_pkcs12_t private_pkcs12_t;
/** /**
@@ -110,7 +114,7 @@ static bool add_key(private_pkcs12_t *this, EVP_PKEY *private)
{ /* no private key is ok */ { /* no private key is ok */
return TRUE; return TRUE;
} }
switch (EVP_PKEY_type(private->type)) switch (EVP_PKEY_base_id(private))
{ {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
type = KEY_RSA; type = KEY_RSA;