projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install OpenSSL 1.1 in the CentOS 7 test environment.
[tinc]
/
src
/
gcrypt
/
digest.c
diff --git
a/src/gcrypt/digest.c
b/src/gcrypt/digest.c
index
066600f
..
fce48ee
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 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007
-2012
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
@@
-37,7
+37,7
@@
static struct {
static bool nametodigest(const char *name, int *algo) {
int i;
static bool nametodigest(const char *name, int *algo) {
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;
@@
-50,7
+50,7
@@
static bool nametodigest(const char *name, int *algo) {
static bool nidtodigest(int nid, int *algo) {
int i;
static bool nidtodigest(int nid, int *algo) {
int i;
- for(i = 0; i < sizeof
digesttable / sizeof *digesttable
; i++) {
+ for(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;
@@
-63,7
+63,7
@@
static bool nidtodigest(int nid, int *algo) {
static bool digesttonid(int algo, int *nid) {
int i;
static bool digesttonid(int algo, int *nid) {
int i;
- for(i = 0; i < sizeof
digesttable / sizeof *digesttable
; i++) {
+ for(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;
@@
-75,17
+75,18
@@
static bool digesttonid(int algo, int *nid) {
static bool digest_open(digest_t *digest, int algo, int maclength) {
if(!digesttonid(algo, &digest->nid)) {
static bool digest_open(digest_t *digest, int algo, int maclength) {
if(!digesttonid(algo, &digest->nid)) {
- logger(LOG_DEBUG, "Digest %d has no corresponding 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);
return false;
}
unsigned int len = gcry_md_get_algo_dlen(algo);
- if(maclength > len || maclength < 0)
+ if(maclength > len || maclength < 0)
{
digest->maclength = len;
digest->maclength = len;
- else
+ } else {
digest->maclength = maclength;
digest->maclength = maclength;
-
+ }
+
digest->algo = algo;
digest->hmac = NULL;
digest->algo = algo;
digest->hmac = NULL;
@@
-96,7
+97,7
@@
bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
int algo;
if(!nametodigest(name, &algo)) {
int algo;
if(!nametodigest(name, &algo)) {
- logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
+ logger(
DEBUG_ALWAYS,
LOG_DEBUG, "Unknown digest name '%s'!", name);
return false;
}
return false;
}
@@
-107,7
+108,7
@@
bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
int algo;
if(!nidtodigest(nid, &algo)) {
int algo;
if(!nidtodigest(nid, &algo)) {
- logger(LOG_DEBUG, "Unknown digest ID %d!", nid);
+ logger(
DEBUG_ALWAYS,
LOG_DEBUG, "Unknown digest ID %d!", nid);
return false;
}
return false;
}
@@
-119,16
+120,21
@@
bool digest_open_sha1(digest_t *digest, int maclength) {
}
void digest_close(digest_t *digest) {
}
void digest_close(digest_t *digest) {
- if(digest->hmac)
+ if(digest->hmac)
{
gcry_md_close(digest->hmac);
gcry_md_close(digest->hmac);
+ }
+
digest->hmac = NULL;
}
bool digest_set_key(digest_t *digest, const void *key, size_t len) {
digest->hmac = NULL;
}
bool digest_set_key(digest_t *digest, const void *key, size_t len) {
- if(!digest->hmac)
+ if(!digest->hmac)
{
gcry_md_open(&digest->hmac, digest->algo, GCRY_MD_FLAG_HMAC);
gcry_md_open(&digest->hmac, digest->algo, GCRY_MD_FLAG_HMAC);
- if(!digest->hmac)
+ }
+
+ if(!digest->hmac) {
return false;
return false;
+ }
return !gcry_md_setkey(digest->hmac, key, len);
}
return !gcry_md_setkey(digest->hmac, key, len);
}
@@
-141,8
+147,11
@@
bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
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);
- if(!tmpdata)
+
+ if(!tmpdata) {
return false;
return false;
+ }
+
memcpy(outdata, tmpdata, digest->maclength);
} else {
char tmpdata[len];
memcpy(outdata, tmpdata, digest->maclength);
} else {
char tmpdata[len];