diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:23:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:25:07 -0500 |
| commit | adf2fa9b4954c584ee381cb94d9c0c81d2c22fec (patch) | |
| tree | 9b193fa9a8745532ca3589491ed08ddad7a8836c /src/common | |
| parent | bd25bda7c0dd5d3c28a03d2555212d6beb338e23 (diff) | |
| download | tor-adf2fa9b4954c584ee381cb94d9c0c81d2c22fec.tar.gz tor-adf2fa9b4954c584ee381cb94d9c0c81d2c22fec.zip | |
Fix compilation under openssl 0.9.8
It's not nice to talk about NID_aes_{128,256}_{ctr,gcm} when they
don't exist.
Fix on 84458b79a78ea7e26820bf0; bug not in any released Tor.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index cbe992ef4e..5afb98e2c0 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -318,10 +318,16 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) 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)); +#ifdef NID_aes_128_ctr log_engine("AES-128-CTR", ENGINE_get_cipher_engine(NID_aes_128_ctr)); +#endif +#ifdef NID_aes_128_gcm log_engine("AES-128-GCM", ENGINE_get_cipher_engine(NID_aes_128_gcm)); +#endif log_engine("AES-256-CBC", ENGINE_get_cipher_engine(NID_aes_256_cbc)); +#ifdef NID_aes_256_gcm log_engine("AES-256-GCM", ENGINE_get_cipher_engine(NID_aes_256_gcm)); +#endif #endif } else { |