hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: removing nettle 3.0 support due to nettle downgrade

Browse Source 
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41264 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Steven Barth
2014-06-18 17:06:37 +00:00
parent 4456b621cb
commit f439aef6cd
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.71
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

29
package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch
View File

@@ -1,29 +0,0 @@
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -20,7 +20,7 @@
#ifdef HAVE_DNSSEC
#include <nettle/rsa.h>
-#include <nettle/dsa.h>
+#include <nettle/dsa-compat.h>
#ifndef NO_NETTLE_ECC
# include <nettle/ecdsa.h>
# include <nettle/ecc-curve.h>
@@ -173,7 +173,7 @@ static int rsa_verify(struct blockdata *
return 0;
}
-static int dsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len,
+static int dnsmasq_dsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len,
unsigned char *digest, int algo)
{
unsigned char *p;
@@ -296,7 +296,7 @@ static int verify(struct blockdata *key_
return rsa_verify(key_data, key_len, sig, sig_len, digest, algo);
case 3: case 6:
- return dsa_verify(key_data, key_len, sig, sig_len, digest, algo);
+ return dnsmasq_dsa_verify(key_data, key_len, sig, sig_len, digest, algo);
#ifndef NO_NETTLE_ECC
case 13: case 14: