projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assign more suitable types and fix narrowing conversion warns.
[tinc]
/
src
/
gcrypt
/
digest.c
diff --git
a/src/gcrypt/digest.c
b/src/gcrypt/digest.c
index
ac5dc74
..
3333f5f
100644
(file)
--- a/
src/gcrypt/digest.c
+++ b/
src/gcrypt/digest.c
@@
-24,7
+24,7
@@
static struct {
const char *name;
static struct {
const char *name;
-
int
algo;
+
enum gcry_md_algos
algo;
int nid;
} digesttable[] = {
{"none", GCRY_MD_NONE, 0},
int nid;
} digesttable[] = {
{"none", GCRY_MD_NONE, 0},
@@
-34,10
+34,10
@@
static struct {
{"sha512", GCRY_MD_SHA512, 674},
};
{"sha512", GCRY_MD_SHA512, 674},
};
-static bool nametodigest(const char *name,
int
*algo) {
+static bool nametodigest(const char *name,
enum gcry_md_algos
*algo) {
int i;
int i;
- for(i = 0; i < sizeof(digesttable) / sizeof
* digesttable
; i++) {
+ for(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,10
+47,8
@@
static bool nametodigest(const char *name, int *algo) {
return false;
}
return false;
}
-static bool nidtodigest(int nid, int *algo) {
- int i;
-
- for(i = 0; i < sizeof(digesttable) / sizeof * digesttable; i++) {
+static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
+ for(int 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;
@@
-60,10
+58,8
@@
static bool nidtodigest(int nid, int *algo) {
return false;
}
return false;
}
-static bool digesttonid(int algo, int *nid) {
- int i;
-
- for(i = 0; i < sizeof(digesttable) / sizeof * digesttable; i++) {
+static bool digesttonid(enum gcry_md_algos algo, int *nid) {
+ for(int 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;
@@
-73,7
+69,7
@@
static bool digesttonid(int algo, int *nid) {
return false;
}
return false;
}
-static bool digest_open(digest_t *digest,
int algo, in
t maclength) {
+static bool digest_open(digest_t *digest,
enum gcry_md_algos algo, size_
t maclength) {
if(!digesttonid(algo, &digest->nid)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
return false;
if(!digesttonid(algo, &digest->nid)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
return false;
@@
-93,8
+89,8
@@
static bool digest_open(digest_t *digest, int algo, int maclength) {
return true;
}
return true;
}
-bool digest_open_by_name(digest_t *digest, const char *name,
in
t maclength) {
-
int
algo;
+bool digest_open_by_name(digest_t *digest, const char *name,
size_
t maclength) {
+
enum gcry_md_algos
algo;
if(!nametodigest(name, &algo)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
if(!nametodigest(name, &algo)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
@@
-104,8
+100,8
@@
bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
return digest_open(digest, algo, maclength);
}
return digest_open(digest, algo, maclength);
}
-bool digest_open_by_nid(digest_t *digest, int nid,
in
t maclength) {
-
int
algo;
+bool digest_open_by_nid(digest_t *digest, int nid,
size_
t maclength) {
+
enum gcry_md_algos
algo;
if(!nidtodigest(nid, &algo)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
if(!nidtodigest(nid, &algo)) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
@@
-115,7
+111,7
@@
bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
return digest_open(digest, algo, maclength);
}
return digest_open(digest, algo, maclength);
}
-bool digest_open_sha1(digest_t *digest,
in
t maclength) {
+bool digest_open_sha1(digest_t *digest,
size_
t maclength) {
return digest_open(digest, GCRY_MD_SHA1, maclength);
}
return digest_open(digest, GCRY_MD_SHA1, maclength);
}
@@
-143,7
+139,7
@@
bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
unsigned int len = gcry_md_get_algo_dlen(digest->algo);
if(digest->hmac) {
unsigned int len = gcry_md_get_algo_dlen(digest->algo);
if(digest->hmac) {
-
char
*tmpdata;
+
uint8_t
*tmpdata;
gcry_md_reset(digest->hmac);
gcry_md_write(digest->hmac, indata, inlen);
tmpdata = gcry_md_read(digest->hmac, digest->algo);
gcry_md_reset(digest->hmac);
gcry_md_write(digest->hmac, indata, inlen);
tmpdata = gcry_md_read(digest->hmac, digest->algo);
@@
-163,8
+159,8
@@
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) {
}
bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
-
unsigned in
t len = digest->maclength;
-
char
outdata[len];
+
size_
t len = digest->maclength;
+
uint8_t
outdata[len];
return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
}
return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
}