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

14
src/openssl.h
View File

@@ -280,18 +280,8 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
#define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx)
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#define libssh2_crypto_init() \
ENGINE_load_builtin_engines(); \
ENGINE_register_all_complete()
#else
#define libssh2_crypto_init() \
OpenSSL_add_all_algorithms(); \
OpenSSL_add_all_ciphers(); \
ENGINE_load_builtin_engines(); \
ENGINE_register_all_complete()
#endif
extern void _libssh2_openssl_crypto_init(void);
#define libssh2_crypto_init() _libssh2_openssl_crypto_init()
#define libssh2_crypto_exit()
#define libssh2_rsa_ctx RSA