diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-11 17:32:24 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-11 17:32:24 +0000 |
| commit | 81d835525557e9b836c5705827aa48b8678bd7f5 (patch) | |
| tree | 7553d69ff4c729caff57e2a81bfa5308c05f7890 /lib | |
| parent | eefd307ec6eeccf25b82953793ccd0198f340d59 (diff) | |
Nuke ssl3_default_timeout().
ok "flensing knife"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/ssl/s3_lib.c | 12 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index b68aaabbbf8..984e343c95d 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/lib/libssl/src/ssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.102 2015/09/11 16:50:46 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.103 2015/09/11 17:32:23 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1896,16 +1896,6 @@ SSL_CIPHER ssl3_ciphers[] = { /* end of list */ }; -long -ssl3_default_timeout(void) -{ - /* - * 2 hours, the 24 hours mentioned in the SSLv3 spec - * is way too long for http, the cache would over fill - */ - return (60 * 60 * 2); -} - int ssl3_num_ciphers(void) { diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 56d2e987467..897673c8d30 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.115 2015/09/11 17:29:36 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.116 2015/09/11 17:32:23 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -654,7 +654,6 @@ int ssl3_handshake_write(SSL *s); void ssl3_record_sequence_increment(unsigned char *seq); int ssl3_do_change_cipher_spec(SSL *ssl); -long ssl3_default_timeout(void); int ssl23_read(SSL *s, void *buf, int len); int ssl23_peek(SSL *s, void *buf, int len); |