lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-21 14:00:51 +03:00
Code Activity

openssl: add OpenSSL 1.1.0-pre3-dev compatibility

Browse Source 
by using API instead of accessing an internal structure.

Closes #83
This commit is contained in:
Viktor Szakats
2016-02-13 17:02:23 +01:00
committed by Daniel Stenberg
parent 652ae4d134
commit 298f056fd6
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openssl.c
View File

@@ -958,6 +958,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
int st; int st;
BIO* bp; BIO* bp;
EVP_PKEY* pk; EVP_PKEY* pk;
int pktype;
_libssh2_debug(session, _libssh2_debug(session,
LIBSSH2_TRACE_AUTH, LIBSSH2_TRACE_AUTH,
@@ -992,7 +993,14 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
"private key file format"); "private key file format");
} }
switch (pk->type) { #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER)
pktype = EVP_PKEY_id(pk);
#else
pktype = pk->type;
#endif
switch (pktype) {
case EVP_PKEY_RSA : case EVP_PKEY_RSA :
st = gen_publickey_from_rsa_evp( st = gen_publickey_from_rsa_evp(
session, method, method_len, pubkeydata, pubkeydata_len, pk); session, method, method_len, pubkeydata, pubkeydata_len, pk);
@@ -1031,6 +1039,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
int st; int st;
BIO* bp; BIO* bp;
EVP_PKEY* pk; EVP_PKEY* pk;
int pktype;
_libssh2_debug(session, _libssh2_debug(session,
LIBSSH2_TRACE_AUTH, LIBSSH2_TRACE_AUTH,
@@ -1061,7 +1070,14 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
"private key file format"); "private key file format");
} }
switch (pk->type) { #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER)
pktype = EVP_PKEY_id(pk);
#else
pktype = pk->type;
#endif
switch (pktype) {
case EVP_PKEY_RSA : case EVP_PKEY_RSA :
st = gen_publickey_from_rsa_evp(session, method, method_len, st = gen_publickey_from_rsa_evp(session, method, method_len,
pubkeydata, pubkeydata_len, pk); pubkeydata, pubkeydata_len, pk);