diff options
Diffstat (limited to 'net-misc/iputils/files/iputils-99999999-openssl.patch')
| -rw-r--r-- | net-misc/iputils/files/iputils-99999999-openssl.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch deleted file mode 100644 index 13f5639a6fb6..000000000000 --- a/net-misc/iputils/files/iputils-99999999-openssl.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Thu, 24 Jan 2013 23:32:39 -0500 -Subject: [PATCH iputils] ping6: allow disabling of openssl support - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 5 ++++- - iputils_md5dig.h | 4 +++- - ping6.c | 10 ++++++++++ - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 54e5a6d..7147f08 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE= - - # Libgcrypt (for MD5) for ping6 [yes|no|static] - USE_GCRYPT=yes --# Crypto library for ping6 [shared|static] -+# Crypto library for ping6 [shared|static|no] - USE_CRYPTO=shared - # Resolv library for ping6 [yes|static] - USE_RESOLV=yes -@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT)) - DEF_CRYPTO = -DUSE_GCRYPT - else -+ifneq ($(USE_CRYPTO),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO)) -+ DEF_CRYPTO = -DUSE_OPENSSL -+endif - endif - - # USE_RESOLV: LIB_RESOLV -diff --git a/iputils_md5dig.h b/iputils_md5dig.h -index 4cec866..d6c4d46 100644 ---- a/iputils_md5dig.h -+++ b/iputils_md5dig.h -@@ -5,8 +5,10 @@ - # include <stdlib.h> - # include <gcrypt.h> - # define IPUTILS_MD5DIG_LEN 16 --#else -+# define USE_CRYPTO -+#elif defined(USE_OPENSSL) - # include <openssl/md5.h> -+# define USE_CRYPTO - #endif - - #ifdef USE_GCRYPT -diff --git a/ping6.c b/ping6.c -index 7085f31..7b7c1af 100644 ---- a/ping6.c -+++ b/ping6.c -@@ -324,6 +324,7 @@ static void niquery_init_nonce(void) - #if !PING6_NONCE_MEMORY - static int niquery_nonce(__u8 *nonce, int fill) - { -+# ifdef USE_CRYPTO - static __u8 digest[MD5_DIGEST_LENGTH]; - static int seq = -1; - -@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill) - return -1; - return ntohsp((__u16 *)nonce); - } -+# else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+# endif - } - #endif - -@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg) - - static int niquery_option_subject_name_handler(int index, const char *arg) - { -+#ifdef USE_CRYPTO - static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; - unsigned char *dnptrs[2], **dpp, **lastdnptr; - int n; -@@ -625,6 +631,10 @@ errexit: - free(idn); - free(name); - exit(1); -+#else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+#endif - } - - int niquery_option_help_handler(int index, const char *arg) --- -2.3.5 - |