diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-06-27 17:26:16 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-29 11:09:37 +0200 |
| commit | 985d7b1c67213400a7c9ca389caaab0a09f80eb5 (patch) | |
| tree | ca42467729af70ecb8ee227652e4999915bdf42a /src | |
| parent | a9f388e368f5db4c910c57a30ec16170b9ade3c8 (diff) | |
| download | strongswan-985d7b1c67213400a7c9ca389caaab0a09f80eb5.tar.bz2 strongswan-985d7b1c67213400a7c9ca389caaab0a09f80eb5.tar.xz | |
openssl: Update PKCS#12 API to OpenSSL 1.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_pkcs12.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_pkcs12.c b/src/libstrongswan/plugins/openssl/openssl_pkcs12.c index d16b2cc05..705e96c69 100644 --- a/src/libstrongswan/plugins/openssl/openssl_pkcs12.c +++ b/src/libstrongswan/plugins/openssl/openssl_pkcs12.c @@ -23,6 +23,10 @@ #include <library.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; /** @@ -110,7 +114,7 @@ static bool add_key(private_pkcs12_t *this, EVP_PKEY *private) { /* no private key is ok */ return TRUE; } - switch (EVP_PKEY_type(private->type)) + switch (EVP_PKEY_base_id(private)) { case EVP_PKEY_RSA: type = KEY_RSA; |