diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-01-11 11:07:37 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-01-11 11:07:37 -0500 |
commit | f37181620951d2e7a13f1363386563115d628761 (patch) | |
tree | 2b793547ade6daf1ed3c9942e3d1de68f5d94983 | |
parent | 53d88eb1ecf7714772d9cb54a1d649e518dd5f47 (diff) | |
parent | 0126150c2d42c028c208529caf853c0d19ec4f5f (diff) | |
download | tor-f37181620951d2e7a13f1363386563115d628761.tar.gz tor-f37181620951d2e7a13f1363386563115d628761.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
-rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 834e5f182e..28bb3f9b41 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1185,8 +1185,8 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, "might otherwise be vulnerable to CVE-2011-4657 " "(compile-time version %08lx (%s); " "runtime version %08lx (%s))", - OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, - SSLeay(), SSLeay_version(SSLEAY_VERSION)); + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + (unsigned long)SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); } |