aboutsummaryrefslogtreecommitdiff
path: root/src/common/crypto.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-11-18 11:12:24 -0500
committerNick Mathewson <nickm@torproject.org>2013-11-18 11:12:24 -0500
commit84458b79a78ea7e26820bf09a3b916acf59a62f3 (patch)
tree0d0acfb83a7da7df47625e086e14fea0fa4f9778 /src/common/crypto.c
parentfe0d1c666135cab1a06ff12e7e954efb17b08aef (diff)
downloadtor-84458b79a78ea7e26820bf09a3b916acf59a62f3.tar
tor-84458b79a78ea7e26820bf09a3b916acf59a62f3.tar.gz
Log more OpenSSL engine statuses at startup.
Fixes ticket 10043; patch from Joshua Datko.
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r--src/common/crypto.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index c1a2f3393..cbe992ef4 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -307,12 +307,22 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir)
" setting default ciphers.");
ENGINE_set_default(e, ENGINE_METHOD_ALL);
}
+ /* Log, if available, the intersection of the set of algorithms
+ used by Tor and the set of algorithms available in the engine */
log_engine("RSA", ENGINE_get_default_RSA());
log_engine("DH", ENGINE_get_default_DH());
+ log_engine("ECDH", ENGINE_get_default_ECDH());
+ log_engine("ECDSA", ENGINE_get_default_ECDSA());
log_engine("RAND", ENGINE_get_default_RAND());
log_engine("SHA1", ENGINE_get_digest_engine(NID_sha1));
- log_engine("3DES", ENGINE_get_cipher_engine(NID_des_ede3_ecb));
- log_engine("AES", ENGINE_get_cipher_engine(NID_aes_128_ecb));
+ log_engine("3DES-CBC", ENGINE_get_cipher_engine(NID_des_ede3_cbc));
+ log_engine("AES-128-ECB", ENGINE_get_cipher_engine(NID_aes_128_ecb));
+ log_engine("AES-128-CBC", ENGINE_get_cipher_engine(NID_aes_128_cbc));
+ log_engine("AES-128-CTR", ENGINE_get_cipher_engine(NID_aes_128_ctr));
+ log_engine("AES-128-GCM", ENGINE_get_cipher_engine(NID_aes_128_gcm));
+ log_engine("AES-256-CBC", ENGINE_get_cipher_engine(NID_aes_256_cbc));
+ log_engine("AES-256-GCM", ENGINE_get_cipher_engine(NID_aes_256_gcm));
+
#endif
} else {
log_info(LD_CRYPTO, "NOT using OpenSSL engine support.");