diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-07-07 10:07:49 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-07-07 10:07:49 +0000 |
| commit | 475c4b91c05634f5510205234a9eda043514abbc (patch) | |
| tree | 4358daf66ad18115988bfa465f8027aaf09295bf /security/distcache/files/patch-ssl__swamp__swamp.h | |
| parent | devel/stack: Add runtime dep on libffi321 (diff) | |
- Unbreak the build against contemporary versions of OpenSSL
- Hoop up a simple test to our framework so we know it works
PR: 236820
Notes
Notes:
svn path=/head/; revision=541400
Diffstat (limited to 'security/distcache/files/patch-ssl__swamp__swamp.h')
| -rw-r--r-- | security/distcache/files/patch-ssl__swamp__swamp.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/distcache/files/patch-ssl__swamp__swamp.h b/security/distcache/files/patch-ssl__swamp__swamp.h index 763b1922bb24..842826594d5a 100644 --- a/security/distcache/files/patch-ssl__swamp__swamp.h +++ b/security/distcache/files/patch-ssl__swamp__swamp.h @@ -1,12 +1,15 @@ ---- ssl/swamp/swamp.h.orig 2004-02-17 20:29:34 UTC +--- ssl/swamp/swamp.h.orig 2004-04-30 12:58:00 UTC +++ ssl/swamp/swamp.h -@@ -161,7 +161,9 @@ char *util_parse_escaped_string(const ch +@@ -162,8 +162,12 @@ char *util_parse_escaped_string(const char *str_toconv typedef enum st_swamp_sslmeth { SWAMP_SSLMETH_NORMAL, /* SSLv23_client_method() */ -+#ifndef OPENSSL_NO_SSL2 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(OPENSSL_NO_SSL2) SWAMP_SSLMETH_SSLv2, /* SSLv2_client_method() */ +#endif ++#ifndef OPENSSL_NO_SSL3_METHOD SWAMP_SSLMETH_SSLv3, /* SSLv3_client_method() */ ++#endif SWAMP_SSLMETH_TLSv1 /* TLSv1_client_method() */ } swamp_sslmeth; + |