2 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index f6a21d4351..d3108f2663 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.85 2014/10/03 13:58:18 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.86 2014/10/15 17:39:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1825,6 +1825,9 @@ SSL_CTX_new(const SSL_METHOD *meth)
          */
         ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
 
+        /* Disable SSLv3 by default. */
+        ret->options |= SSL_OP_NO_SSLv3;
+
         return (ret);
 err:
         SSLerr(SSL_F_SSL_CTX_NEW,
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index f6a21d4351..d3108f2663 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.85 2014/10/03 13:58:18 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.86 2014/10/15 17:39:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1825,6 +1825,9 @@ SSL_CTX_new(const SSL_METHOD *meth)
          */
         ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
 
+        /* Disable SSLv3 by default. */
+        ret->options |= SSL_OP_NO_SSLv3;
+
         return (ret);
 err:
         SSLerr(SSL_F_SSL_CTX_NEW,