projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we are compatible with LibreSSL.
[tinc]
/
src
/
gcrypt
/
digest.c
diff --git
a/src/gcrypt/digest.c
b/src/gcrypt/digest.c
index
c8d4b31
..
e029168
100644
(file)
--- a/
src/gcrypt/digest.c
+++ b/
src/gcrypt/digest.c
@@
-1,6
+1,6
@@
/*
digest.c -- Digest handling
/*
digest.c -- Digest handling
- Copyright (C) 2007-20
1
2 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-20
2
2 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,27
+17,26
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "system.h"
+#include "
../
system.h"
#include "digest.h"
#include "digest.h"
-#include "logger.h"
+#include "../digest.h"
+#include "../logger.h"
static struct {
const char *name;
static struct {
const char *name;
-
enum gcry_md_algos
algo;
-
in
t nid;
+
md_algo_t
algo;
+
nid_
t nid;
} digesttable[] = {
} digesttable[] = {
- {"none",
GCRY_MD_NONE,
0},
- {"sha1",
GCRY_MD_SHA1,
64},
+ {"none",
GCRY_MD_NONE,
0},
+ {"sha1",
GCRY_MD_SHA1,
64},
{"sha256", GCRY_MD_SHA256, 672},
{"sha384", GCRY_MD_SHA384, 673},
{"sha512", GCRY_MD_SHA512, 674},
};
{"sha256", GCRY_MD_SHA256, 672},
{"sha384", GCRY_MD_SHA384, 673},
{"sha512", GCRY_MD_SHA512, 674},
};
-static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
- int i;
-
- for(i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+static bool nametodigest(md_algo_t *algo, const char *name) {
+ for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
if(digesttable[i].name && !strcasecmp(name, digesttable[i].name)) {
*algo = digesttable[i].algo;
return true;
if(digesttable[i].name && !strcasecmp(name, digesttable[i].name)) {
*algo = digesttable[i].algo;
return true;
@@
-47,8
+46,8
@@
static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
return false;
}
return false;
}
-static bool nidtodigest(
int nid, enum gcry_md_algos *algo
) {
- for(
in
t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+static bool nidtodigest(
md_algo_t *algo, nid_t nid
) {
+ for(
size_
t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
if(nid == digesttable[i].nid) {
*algo = digesttable[i].algo;
return true;
if(nid == digesttable[i].nid) {
*algo = digesttable[i].algo;
return true;
@@
-58,8
+57,8
@@
static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
return false;
}
return false;
}
-static bool digesttonid(
enum gcry_md_algos algo, int *nid
) {
- for(
in
t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+static bool digesttonid(
nid_t *nid, md_algo_t algo
) {
+ for(
size_
t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
if(algo == digesttable[i].algo) {
*nid = digesttable[i].nid;
return true;
if(algo == digesttable[i].algo) {
*nid = digesttable[i].nid;
return true;
@@
-69,15
+68,15
@@
static bool digesttonid(enum gcry_md_algos algo, int *nid) {
return false;
}
return false;
}
-static bool digest_open(digest_t *digest,
enum gcry_md_algos
algo, size_t maclength) {
- if(!digesttonid(
algo, &digest->nid
)) {
+static bool digest_open(digest_t *digest,
md_algo_t
algo, size_t maclength) {
+ if(!digesttonid(
&digest->nid, algo
)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
return false;
}
unsigned int len = gcry_md_get_algo_dlen(algo);
logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
return false;
}
unsigned int len = gcry_md_get_algo_dlen(algo);
- if(maclength > len
|| maclength < 0
) {
+ if(maclength > len) {
digest->maclength = len;
} else {
digest->maclength = maclength;
digest->maclength = len;
} else {
digest->maclength = maclength;
@@
-90,9
+89,9
@@
static bool digest_open(digest_t *digest, enum gcry_md_algos algo, size_t maclen
}
bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
}
bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
-
enum gcry_md_algos
algo;
+
md_algo_t
algo;
- if(!nametodigest(
name, &algo
)) {
+ if(!nametodigest(
&algo, name
)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
return false;
}
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
return false;
}
@@
-100,10
+99,10
@@
bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
return digest_open(digest, algo, maclength);
}
return digest_open(digest, algo, maclength);
}
-bool digest_open_by_nid(digest_t *digest,
in
t nid, size_t maclength) {
-
enum gcry_md_algos
algo;
+bool digest_open_by_nid(digest_t *digest,
nid_
t nid, size_t maclength) {
+
md_algo_t
algo;
- if(!nidtodigest(
nid, &algo
)) {
+ if(!nidtodigest(
&algo, nid
)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
return false;
}
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
return false;
}
@@
-111,11
+110,11
@@
bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
return digest_open(digest, algo, maclength);
}
return digest_open(digest, algo, maclength);
}
-bool digest_open_sha1(digest_t *digest, size_t maclength) {
- return digest_open(digest, GCRY_MD_SHA1, maclength);
-}
-
void digest_close(digest_t *digest) {
void digest_close(digest_t *digest) {
+ if(!digest) {
+ return;
+ }
+
if(digest->hmac) {
gcry_md_close(digest->hmac);
}
if(digest->hmac) {
gcry_md_close(digest->hmac);
}
@@
-150,7
+149,7
@@
bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
memcpy(outdata, tmpdata, digest->maclength);
} else {
memcpy(outdata, tmpdata, digest->maclength);
} else {
- char
tmpdata[len]
;
+ char
*tmpdata = alloca(len)
;
gcry_md_hash_buffer(digest->algo, tmpdata, indata, inlen);
memcpy(outdata, tmpdata, digest->maclength);
}
gcry_md_hash_buffer(digest->algo, tmpdata, indata, inlen);
memcpy(outdata, tmpdata, digest->maclength);
}
@@
-160,12
+159,12
@@
bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
size_t len = digest->maclength;
bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
size_t len = digest->maclength;
- uint8_t
outdata[len]
;
+ uint8_t
*outdata = alloca(len)
;
return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
}
return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
}
-
in
t digest_get_nid(const digest_t *digest) {
+
nid_
t digest_get_nid(const digest_t *digest) {
if(!digest || !digest->nid) {
return 0;
}
if(!digest || !digest->nid) {
return 0;
}