diff options
author | guenther <> | 2014-04-20 12:48:19 +0000 |
---|---|---|
committer | guenther <> | 2014-04-20 12:48:19 +0000 |
commit | 71d6ded93deb4d1edc464874b5359ece0ef857d2 (patch) | |
tree | cca6edfc57a2953a5fb440052243f46cd8d7eb12 /src/lib/libssl/ssl_lib.c | |
parent | 4b4a5d4b04e0ebd28c425210967942e4fa5d834c (diff) | |
download | openbsd-71d6ded93deb4d1edc464874b5359ece0ef857d2.tar.gz openbsd-71d6ded93deb4d1edc464874b5359ece0ef857d2.tar.bz2 openbsd-71d6ded93deb4d1edc464874b5359ece0ef857d2.zip |
Chop off more SSLv2 tentacles and start fixing and noting y2038 issues.
APIs that pass times as longs will have to change at some point...
Bump major on both libcrypto and libssl.
ok tedu@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 3ab353b8eb..21d6835b98 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1712,11 +1712,8 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
1712 | ret->references = 1; | 1712 | ret->references = 1; |
1713 | ret->quiet_shutdown = 0; | 1713 | ret->quiet_shutdown = 0; |
1714 | 1714 | ||
1715 | /* ret->cipher=NULL;*/ | 1715 | /* ret->cipher=NULL; |
1716 | /* ret->s2->challenge=NULL; | ||
1717 | ret->master_key=NULL; | 1716 | ret->master_key=NULL; |
1718 | ret->key_arg=NULL; | ||
1719 | ret->s2->conn_id=NULL; | ||
1720 | */ | 1717 | */ |
1721 | 1718 | ||
1722 | ret->info_callback = NULL; | 1719 | ret->info_callback = NULL; |
@@ -2340,7 +2337,7 @@ ssl_update_cache(SSL *s, int mode) | |||
2340 | if ((((mode & SSL_SESS_CACHE_CLIENT) | 2337 | if ((((mode & SSL_SESS_CACHE_CLIENT) |
2341 | ?s->session_ctx->stats.sess_connect_good | 2338 | ?s->session_ctx->stats.sess_connect_good |
2342 | :s->session_ctx->stats.sess_accept_good) & 0xff) == 0xff) { | 2339 | :s->session_ctx->stats.sess_accept_good) & 0xff) == 0xff) { |
2343 | SSL_CTX_flush_sessions(s->session_ctx,(unsigned long)time(NULL)); | 2340 | SSL_CTX_flush_sessions(s->session_ctx, time(NULL)); |
2344 | } | 2341 | } |
2345 | } | 2342 | } |
2346 | } | 2343 | } |