summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordoug <>2015-10-25 15:52:49 +0000
committerdoug <>2015-10-25 15:52:49 +0000
commit3f1b7952aea47c899837e322b46789df0cef2709 (patch)
treecbd976f80558d8aa0052f77b863457a310530944 /src
parent1b22d2c5e4e56c3e39d49b552bf6edb38fe2e738 (diff)
downloadopenbsd-3f1b7952aea47c899837e322b46789df0cef2709.tar.gz
openbsd-3f1b7952aea47c899837e322b46789df0cef2709.tar.bz2
openbsd-3f1b7952aea47c899837e322b46789df0cef2709.zip
Remove last vestige of SSL_OP_NO_SSLv3 support.
No part of LibreSSL checks for this flag any longer. ok jsing@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c5
-rw-r--r--src/lib/libssl/ssl_lib.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index d37f305387..5b9b952e72 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.115 2015/10/19 17:59:39 beck Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.116 2015/10/25 15:52:49 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1900,9 +1900,6 @@ SSL_CTX_new(const SSL_METHOD *meth)
1900 */ 1900 */
1901 ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; 1901 ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
1902 1902
1903 /* Disable SSLv3 by default. */
1904 ret->options |= SSL_OP_NO_SSLv3;
1905
1906 return (ret); 1903 return (ret);
1907err: 1904err:
1908 SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE); 1905 SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index d37f305387..5b9b952e72 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.115 2015/10/19 17:59:39 beck Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.116 2015/10/25 15:52:49 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1900,9 +1900,6 @@ SSL_CTX_new(const SSL_METHOD *meth)
1900 */ 1900 */
1901 ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; 1901 ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
1902 1902
1903 /* Disable SSLv3 by default. */
1904 ret->options |= SSL_OP_NO_SSLv3;
1905
1906 return (ret); 1903 return (ret);
1907err: 1904err:
1908 SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE); 1905 SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE);