diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-03-12 23:31:16 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-03-12 23:31:16 +0000 |
| commit | bd8ffccae7e1bb4030f9ca5e6dd9c8918256de75 (patch) | |
| tree | 26820b373ebcbe66894a347d59b0136eb9265bbf /src/common | |
| parent | 474c60b7433da2302c35832571f41867714d8f65 (diff) | |
| download | tor-bd8ffccae7e1bb4030f9ca5e6dd9c8918256de75.tar tor-bd8ffccae7e1bb4030f9ca5e6dd9c8918256de75.tar.gz | |
More cleanups noticed by weasel; also, remove macros that nobody uses.
svn:r6143
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/aes.c | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index a0c759dc4..088d29a18 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -48,8 +48,6 @@ typedef uint32_t u32; typedef uint8_t u8; #ifndef USE_OPENSSL_AES -#define MAXKC (256/32) -#define MAXKB (256/8) #define MAXNR 14 static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], diff --git a/src/common/crypto.c b/src/common/crypto.c index 1be1bc1a2..789c1fb6b 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -63,28 +63,14 @@ const char crypto_c_id[] = #if OPENSSL_VERSION_NUMBER < 0x00905000l #error "We require openssl >= 0.9.5" -#elif OPENSSL_VERSION_NUMBER < 0x00906000l -#define OPENSSL_095 #endif #if OPENSSL_VERSION_NUMBER < 0x00907000l -#define OPENSSL_PRE_097 #define NO_ENGINES #else #include <openssl/engine.h> #endif -/* Certain functions that return a success code in OpenSSL 0.9.6 return void - * (and don't indicate errors) in OpenSSL version 0.9.5. - * - * [OpenSSL 0.9.5 matters, because it ships with Redhat 6.2.] - */ -#ifdef OPENSSL_095 -#define RETURN_SSL_OUTCOME(exp) (exp); return 0 -#else -#define RETURN_SSL_OUTCOME(exp) return !(exp) -#endif - /** Macro: is k a valid RSA public or private key? */ #define PUBLIC_KEY_OK(k) ((k) && (k)->key && (k)->key->n) /** Macro: is k a valid RSA private key? */ |