summaryrefslogtreecommitdiff
path: root/usr.sbin/relayd/parse.y
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-11-07 13:48:07 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-11-07 13:48:07 +0000
commitf7a9764f365f980562c4cb7323052a2ac6ce883c (patch)
treeadaeb5abfd98b8eb16cbdb88efc21ee2a8caec7b /usr.sbin/relayd/parse.y
parentc0a09fa0dca93ad873e0fae8cf9dd154c8508f11 (diff)
Remove the sslv2 option since LibreSSL has no SSLv2 support (however retain
SSL_OP_NO_SSLv2 in case you happen to be running relayd on another platform with another SSL library). Also fix the SSLv3 handling so that 'no sslv3' actually works as intended. ok reyk@
Diffstat (limited to 'usr.sbin/relayd/parse.y')
-rw-r--r--usr.sbin/relayd/parse.y6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index f8575c93633..fcb91f9d1d6 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.192 2014/11/02 13:59:40 bluhm Exp $ */
+/* $OpenBSD: parse.y,v 1.193 2014/11/07 13:48:06 jsing Exp $ */
/*
* Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -1059,9 +1059,7 @@ sslflags : SESSION CACHE sslcache { proto->cache = $3; }
;
flag : STRING {
- if (strcmp("sslv2", $1) == 0)
- $$ = SSLFLAG_SSLV2;
- else if (strcmp("sslv3", $1) == 0)
+ if (strcmp("sslv3", $1) == 0)
$$ = SSLFLAG_SSLV3;
else if (strcmp("tlsv1", $1) == 0)
$$ = SSLFLAG_TLSV1;