From 65a4528d17438b4856443762f283ed87b60462c9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 14 Feb 2016 23:53:11 +0100 Subject: [PATCH] openssl: apply new HAVE_OPAQUE_STRUCTS macro Closes #81 --- src/openssl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/openssl.c b/src/openssl.c index c312f8e2a8..b0c695d7b1 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -993,8 +993,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, "private key file format"); } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_STRUCTS pktype = EVP_PKEY_id(pk); #else pktype = pk->type; @@ -1070,8 +1069,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session, "private key file format"); } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_STRUCTS pktype = EVP_PKEY_id(pk); #else pktype = pk->type;