diff options
Diffstat (limited to 'debian/patches/dnssec-sshfp.patch')
-rw-r--r-- | debian/patches/dnssec-sshfp.patch | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch index 0615de097..3cb291e97 100644 --- a/debian/patches/dnssec-sshfp.patch +++ b/debian/patches/dnssec-sshfp.patch | |||
@@ -1,15 +1,27 @@ | |||
1 | Description: Force use of DNSSEC even if "options edns0" isn't in resolv.conf | 1 | From 145099bdca1b959e2ef3555cd6ce0bc44fb69ce8 Mon Sep 17 00:00:00 2001 |
2 | This allows SSHFP DNS records to be verified if glibc 2.11 is installed. | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:01 +0000 | ||
4 | Subject: Force use of DNSSEC even if "options edns0" isn't in resolv.conf | ||
5 | |||
6 | This allows SSHFP DNS records to be verified if glibc 2.11 is installed. | ||
7 | |||
3 | Origin: vendor, https://cvs.fedoraproject.org/viewvc/F-12/openssh/openssh-5.2p1-edns.patch?revision=1.1&view=markup | 8 | Origin: vendor, https://cvs.fedoraproject.org/viewvc/F-12/openssh/openssh-5.2p1-edns.patch?revision=1.1&view=markup |
4 | Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 | 9 | Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 |
5 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 | 10 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 |
6 | Last-Update: 2010-04-06 | 11 | Last-Update: 2010-04-06 |
7 | 12 | ||
8 | Index: b/dns.c | 13 | Patch-Name: dnssec-sshfp.patch |
9 | =================================================================== | 14 | --- |
15 | dns.c | 14 +++++++++++++- | ||
16 | openbsd-compat/getrrsetbyname.c | 10 +++++----- | ||
17 | openbsd-compat/getrrsetbyname.h | 3 +++ | ||
18 | 3 files changed, 21 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/dns.c b/dns.c | ||
21 | index 630b97a..478c3d9 100644 | ||
10 | --- a/dns.c | 22 | --- a/dns.c |
11 | +++ b/dns.c | 23 | +++ b/dns.c |
12 | @@ -196,6 +196,7 @@ | 24 | @@ -196,6 +196,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, |
13 | { | 25 | { |
14 | u_int counter; | 26 | u_int counter; |
15 | int result; | 27 | int result; |
@@ -17,7 +29,7 @@ Index: b/dns.c | |||
17 | struct rrsetinfo *fingerprints = NULL; | 29 | struct rrsetinfo *fingerprints = NULL; |
18 | 30 | ||
19 | u_int8_t hostkey_algorithm; | 31 | u_int8_t hostkey_algorithm; |
20 | @@ -219,8 +220,19 @@ | 32 | @@ -219,8 +220,19 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, |
21 | return -1; | 33 | return -1; |
22 | } | 34 | } |
23 | 35 | ||
@@ -38,11 +50,11 @@ Index: b/dns.c | |||
38 | if (result) { | 50 | if (result) { |
39 | verbose("DNS lookup error: %s", dns_result_totext(result)); | 51 | verbose("DNS lookup error: %s", dns_result_totext(result)); |
40 | return -1; | 52 | return -1; |
41 | Index: b/openbsd-compat/getrrsetbyname.c | 53 | diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c |
42 | =================================================================== | 54 | index dc6fe05..e061a29 100644 |
43 | --- a/openbsd-compat/getrrsetbyname.c | 55 | --- a/openbsd-compat/getrrsetbyname.c |
44 | +++ b/openbsd-compat/getrrsetbyname.c | 56 | +++ b/openbsd-compat/getrrsetbyname.c |
45 | @@ -209,8 +209,8 @@ | 57 | @@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, |
46 | goto fail; | 58 | goto fail; |
47 | } | 59 | } |
48 | 60 | ||
@@ -53,7 +65,7 @@ Index: b/openbsd-compat/getrrsetbyname.c | |||
53 | result = ERRSET_INVAL; | 65 | result = ERRSET_INVAL; |
54 | goto fail; | 66 | goto fail; |
55 | } | 67 | } |
56 | @@ -226,9 +226,9 @@ | 68 | @@ -226,9 +226,9 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, |
57 | #endif /* DEBUG */ | 69 | #endif /* DEBUG */ |
58 | 70 | ||
59 | #ifdef RES_USE_DNSSEC | 71 | #ifdef RES_USE_DNSSEC |
@@ -66,8 +78,8 @@ Index: b/openbsd-compat/getrrsetbyname.c | |||
66 | #endif /* RES_USE_DNSEC */ | 78 | #endif /* RES_USE_DNSEC */ |
67 | 79 | ||
68 | /* make query */ | 80 | /* make query */ |
69 | Index: b/openbsd-compat/getrrsetbyname.h | 81 | diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h |
70 | =================================================================== | 82 | index 1283f55..dbbc85a 100644 |
71 | --- a/openbsd-compat/getrrsetbyname.h | 83 | --- a/openbsd-compat/getrrsetbyname.h |
72 | +++ b/openbsd-compat/getrrsetbyname.h | 84 | +++ b/openbsd-compat/getrrsetbyname.h |
73 | @@ -72,6 +72,9 @@ | 85 | @@ -72,6 +72,9 @@ |