From ebee891d768c9e1ff392b56609721400f0632997 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 11 Sep 2015 17:32:23 +0000
Subject: Nuke ssl3_default_timeout().

ok "flensing knife"
---
 src/lib/libssl/s3_lib.c           | 12 +-----------
 src/lib/libssl/src/ssl/s3_lib.c   | 12 +-----------
 src/lib/libssl/src/ssl/ssl_locl.h |  3 +--
 src/lib/libssl/ssl_locl.h         |  3 +--
 4 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index b68aaabbbf..984e343c95 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/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/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index b68aaabbbf..984e343c95 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/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/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 56d2e98746..897673c8d3 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/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);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 56d2e98746..897673c8d3 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/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);
-- 
cgit v1.2.3-55-g6feb