Skip to content

Commit

Permalink
openssl: apply new HAVE_OPAQUE_STRUCTS macro
Browse files Browse the repository at this point in the history
Closes libssh2#81
  • Loading branch information
vszakats authored and bagder committed Feb 15, 2016
1 parent 0ffb3bf commit 65a4528
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 65a4528

Please sign in to comment.