diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-11 11:07:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-11 11:07:13 -0500 |
| commit | 0126150c2d42c028c208529caf853c0d19ec4f5f (patch) | |
| tree | 4584659e60e1d213be6079592d8ce58f1ac04ae5 /src | |
| parent | c78a314e95ef7f0d05e9d58066ee6bf6795ee9d7 (diff) | |
| parent | 8d5c0e58ea19fa1bc662c23e1a7ae77d688400fc (diff) | |
| download | tor-0126150c2d42c028c208529caf853c0d19ec4f5f.tar.gz tor-0126150c2d42c028c208529caf853c0d19ec4f5f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src')
| -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 f7a15b0b2a..d766377dcb 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -802,8 +802,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); } |