diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-10-05 11:36:11 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-10-05 11:36:11 +0200 |
| commit | 1bfa3f2a10bc7b7a1bc3e20986a62e8f30a17e03 (patch) | |
| tree | 1e7f57d72c8558d1ca051f3bf1cf371228bea4b8 /src/libstrongswan/plugins/openssl/openssl_util.h | |
| parent | 33241871a82a0c374128373e47380be60f0431fa (diff) | |
| parent | 7caba2eb5524be6b51943bcc3d2cb0e4c5ecc09a (diff) | |
| download | strongswan-1bfa3f2a10bc7b7a1bc3e20986a62e8f30a17e03.tar.bz2 strongswan-1bfa3f2a10bc7b7a1bc3e20986a62e8f30a17e03.tar.xz | |
Merge branch 'priv-key-any'
Adds the ability to parse KEY_ANY keys via the pkcs1 and openssl plugins.
This is then used in the pki utility, where private keys may now be
loaded via `priv` keyword instead of having to specify the type of the key
explicitly. And swanctl can load any type of key from the swanctl/private
directory.
Diffstat (limited to 'src/libstrongswan/plugins/openssl/openssl_util.h')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h index f4186e8c4..7c5c367f7 100644 --- a/src/libstrongswan/plugins/openssl/openssl_util.h +++ b/src/libstrongswan/plugins/openssl/openssl_util.h @@ -136,6 +136,13 @@ int openssl_asn1_known_oid(ASN1_OBJECT *obj); time_t openssl_asn1_to_time(ASN1_TIME *time); /** + * Compatibility macros + */ +#ifdef OPENSSL_IS_BORINGSSL +#define EVP_PKEY_base_id(p) EVP_PKEY_type(p->type) +#endif + +/** * Macros to define fallback getters/setters to access keys (BIGNUM*) for types * that were made opaque with OpenSSL 1.1.0. */ |