diff options
| author |   guenther <guenther@openbsd.org> | 2014-04-20 12:48:19 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2014-04-20 12:48:19 +0000 |
| commit | aa8444d1b1189fd1265d520d7e58af29deb94156 (patch) | |
| tree | 904756879c67d51a6a1adad95dfe645be13dcce7 /lib/libssl/src/ssl/ssl_lib.c | |
| parent | return after error instead of plowing ahead. noticed by mancha1 at zoho (diff) | |
| download | wireguard-openbsd-aa8444d1b1189fd1265d520d7e58af29deb94156.tar.xz wireguard-openbsd-aa8444d1b1189fd1265d520d7e58af29deb94156.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 'lib/libssl/src/ssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index 3ab353b8eb9..21d6835b98e 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1712,11 +1712,8 @@ SSL_CTX_new(const SSL_METHOD *meth) ret->references = 1; ret->quiet_shutdown = 0; -/* ret->cipher=NULL;*/ -/* ret->s2->challenge=NULL; +/* ret->cipher=NULL; ret->master_key=NULL; - ret->key_arg=NULL; - ret->s2->conn_id=NULL; */ ret->info_callback = NULL; @@ -2340,7 +2337,7 @@ ssl_update_cache(SSL *s, int mode) if ((((mode & SSL_SESS_CACHE_CLIENT) ?s->session_ctx->stats.sess_connect_good :s->session_ctx->stats.sess_accept_good) & 0xff) == 0xff) { - SSL_CTX_flush_sessions(s->session_ctx,(unsigned long)time(NULL)); + SSL_CTX_flush_sessions(s->session_ctx, time(NULL)); } } } |