Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
cdb755c5
Commit
cdb755c5
authored
Jun 18, 2014
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FTBFS with Nettle-3.0.
parent
063efb33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
CHANGELOG
CHANGELOG
+3
-0
src/dnssec.c
src/dnssec.c
+12
-6
No files found.
CHANGELOG
View file @
cdb755c5
...
@@ -10,6 +10,9 @@ version 2.72
...
@@ -10,6 +10,9 @@ version 2.72
Add DBus methods SetFilterWin2KOption and SetBogusPrivOption
Add DBus methods SetFilterWin2KOption and SetBogusPrivOption
Thanks to the Smoothwall project for the patch.
Thanks to the Smoothwall project for the patch.
Fix failure to build against Nettle-3.0. Thanks to Steven
Barth for spotting this and finding the fix.
version 2.71
version 2.71
...
...
src/dnssec.c
View file @
cdb755c5
...
@@ -28,6 +28,12 @@
...
@@ -28,6 +28,12 @@
#include <nettle/nettle-meta.h>
#include <nettle/nettle-meta.h>
#include <nettle/bignum.h>
#include <nettle/bignum.h>
/* Nettle-3.0 moved to a new API for DSA. We use a name that's defined in the new API
to detect Nettle-3, and invoke the backwards compatibility mode. */
#ifdef dsa_params_init
#include <nettle/dsa-compat.h>
#endif
#define SERIAL_UNDEF -100
#define SERIAL_UNDEF -100
#define SERIAL_EQ 0
#define SERIAL_EQ 0
...
@@ -121,8 +127,8 @@ static int hash_init(const struct nettle_hash *hash, void **ctxp, unsigned char
...
@@ -121,8 +127,8 @@ static int hash_init(const struct nettle_hash *hash, void **ctxp, unsigned char
return
1
;
return
1
;
}
}
static
int
rsa_verify
(
struct
blockdata
*
key_data
,
unsigned
int
key_len
,
unsigned
char
*
sig
,
size_t
sig_len
,
static
int
dnsmasq_
rsa_verify
(
struct
blockdata
*
key_data
,
unsigned
int
key_len
,
unsigned
char
*
sig
,
size_t
sig_len
,
unsigned
char
*
digest
,
int
algo
)
unsigned
char
*
digest
,
int
algo
)
{
{
unsigned
char
*
p
;
unsigned
char
*
p
;
size_t
exp_len
;
size_t
exp_len
;
...
@@ -173,8 +179,8 @@ static int rsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned
...
@@ -173,8 +179,8 @@ static int rsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned
return
0
;
return
0
;
}
}
static
int
dsa_verify
(
struct
blockdata
*
key_data
,
unsigned
int
key_len
,
unsigned
char
*
sig
,
size_t
sig_len
,
static
int
d
nsmasq_d
sa_verify
(
struct
blockdata
*
key_data
,
unsigned
int
key_len
,
unsigned
char
*
sig
,
size_t
sig_len
,
unsigned
char
*
digest
,
int
algo
)
unsigned
char
*
digest
,
int
algo
)
{
{
unsigned
char
*
p
;
unsigned
char
*
p
;
unsigned
int
t
;
unsigned
int
t
;
...
@@ -293,10 +299,10 @@ static int verify(struct blockdata *key_data, unsigned int key_len, unsigned cha
...
@@ -293,10 +299,10 @@ static int verify(struct blockdata *key_data, unsigned int key_len, unsigned cha
switch
(
algo
)
switch
(
algo
)
{
{
case
1
:
case
5
:
case
7
:
case
8
:
case
10
:
case
1
:
case
5
:
case
7
:
case
8
:
case
10
:
return
rsa_verify
(
key_data
,
key_len
,
sig
,
sig_len
,
digest
,
algo
);
return
dnsmasq_
rsa_verify
(
key_data
,
key_len
,
sig
,
sig_len
,
digest
,
algo
);
case
3
:
case
6
:
case
3
:
case
6
:
return
dsa_verify
(
key_data
,
key_len
,
sig
,
sig_len
,
digest
,
algo
);
return
d
nsmasq_d
sa_verify
(
key_data
,
key_len
,
sig
,
sig_len
,
digest
,
algo
);
#ifndef NO_NETTLE_ECC
#ifndef NO_NETTLE_ECC
case
13
:
case
14
:
case
13
:
case
14
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment