lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-20 02:42:09 +03:00
Code Activity

A collection of small fixes (#198)

Browse Source 
* tests: Remove if-pyramids

* tests: Switch run_command arguments

* tests: Make run_command a vararg function

* tests: Xcode doesn't obey CMake's test working directory

* openssl: move manual AES-CTR cipher into crypto init

* cmake: Move our include dir before all other include paths
This commit is contained in:
Etienne Samson
2018-03-21 00:58:14 +01:00
committed by Will Cosgrove
parent 40a79d3558
commit 54bef4c5da
13 changed files with 194 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/openssl.c
View File

@@ -617,17 +617,26 @@ _libssh2_EVP_aes_256_ctr(void)
#endif
}
void _libssh2_init_aes_ctr(void)
#endif /* LIBSSH2_AES_CTR */
void _libssh2_openssl_crypto_init(void)
{
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
ENGINE_load_builtin_engines();
ENGINE_register_all_complete();
#else
OpenSSL_add_all_algorithms();
OpenSSL_add_all_ciphers();
ENGINE_load_builtin_engines();
ENGINE_register_all_complete();
#endif
#ifndef HAVE_EVP_AES_128_CTR
_libssh2_EVP_aes_128_ctr();
_libssh2_EVP_aes_192_ctr();
_libssh2_EVP_aes_256_ctr();
#endif
}
#else
void _libssh2_init_aes_ctr(void) {}
#endif /* LIBSSH2_AES_CTR */
/* TODO: Optionally call a passphrase callback specified by the
* calling program
*/