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

Fix for #188 (#189)

Browse Source 
* Update openssl.c

* Create openssl.h
This commit is contained in:
Will Cosgrove
2017-06-09 14:59:18 -07:00
committed by GitHub
parent c423b543ca
commit 6762664e7e
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openssl.c
View File

@@ -1056,16 +1056,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
"Unable to extract public key from private key " "Unable to extract public key from private key "
"file: Unable to open private key file"); "file: Unable to open private key file");
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (!EVP_get_cipherbyname("des")) {
/* If this cipher isn't loaded it's a pretty good indication that none
* are. I have *NO DOUBT* that there's a better way to deal with this
* ($#&%#$(%$#( Someone buy me an OpenSSL manual and I'll read up on
* it.
*/
OpenSSL_add_all_ciphers();
}
#endif
BIO_reset(bp); BIO_reset(bp);
pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase); pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase);
BIO_free(bp); BIO_free(bp);

1
src/openssl.h
View File

@@ -233,6 +233,7 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
#else #else
#define libssh2_crypto_init() \ #define libssh2_crypto_init() \
OpenSSL_add_all_algorithms(); \ OpenSSL_add_all_algorithms(); \
OpenSSL_add_all_ciphers(); \
ENGINE_load_builtin_engines(); \ ENGINE_load_builtin_engines(); \
ENGINE_register_all_complete() ENGINE_register_all_complete()
#endif #endif