summaryrefslogtreecommitdiff
path: root/security/distcache/files/patch-ssl__swamp__utils.c
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2016-09-12 13:23:47 +0000
committerJohn Marino <marino@FreeBSD.org>2016-09-12 13:23:47 +0000
commit3e44fb49d94ddfb9aaf14b9240e1beaa7ca0a576 (patch)
treee533925e86542aab73a63a5de44818dcb06c5406 /security/distcache/files/patch-ssl__swamp__utils.c
parentnet/fping: Update to 3.13 (diff)
security/distcache: Configure SSL base, fix build on LibreSSL
While here, simplify existing patch for modern FreeBSD and DragonFly
Notes
Notes: svn path=/head/; revision=421923
Diffstat (limited to 'security/distcache/files/patch-ssl__swamp__utils.c')
-rw-r--r--security/distcache/files/patch-ssl__swamp__utils.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/security/distcache/files/patch-ssl__swamp__utils.c b/security/distcache/files/patch-ssl__swamp__utils.c
index bb68c905c223..813fd3ab268b 100644
--- a/security/distcache/files/patch-ssl__swamp__utils.c
+++ b/security/distcache/files/patch-ssl__swamp__utils.c
@@ -1,6 +1,6 @@
---- ssl/swamp/utils.c.orig 2004-02-17 15:29:34.000000000 -0500
-+++ ssl/swamp/utils.c 2015-03-23 19:47:34.795067000 -0400
-@@ -269,8 +269,10 @@
+--- ssl/swamp/utils.c.orig 2004-02-17 20:29:34 UTC
++++ ssl/swamp/utils.c
+@@ -269,10 +269,14 @@ int util_parse_sslmeth(const char *str_t
{
if(!strcmp(str_toconvert, "normal"))
*val = SWAMP_SSLMETH_NORMAL;
@@ -8,6 +8,10 @@
else if(!strcmp(str_toconvert, "sslv2"))
*val = SWAMP_SSLMETH_SSLv2;
+#endif
++#ifndef OPENSSL_NO_SSL3
else if(!strcmp(str_toconvert, "sslv3"))
*val = SWAMP_SSLMETH_SSLv3;
++#endif
else if(!strcmp(str_toconvert, "tlsv1"))
+ *val = SWAMP_SSLMETH_TLSv1;
+ else