X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Fdigest.c;h=c8d4b3149b36f54e7cf31b4e4ec30719dd310099;hb=77cd819058de43a5fcea54300dde50e03088c318;hp=639fa67790131098203e1902713b01644415c171;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=tinc diff --git a/src/gcrypt/digest.c b/src/gcrypt/digest.c index 639fa677..c8d4b314 100644 --- a/src/gcrypt/digest.c +++ b/src/gcrypt/digest.c @@ -1,6 +1,6 @@ /* digest.c -- Digest handling - Copyright (C) 2007 Guus Sliepen + Copyright (C) 2007-2012 Guus Sliepen 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 @@ -12,11 +12,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -26,7 +24,7 @@ static struct { const char *name; - int algo; + enum gcry_md_algos algo; int nid; } digesttable[] = { {"none", GCRY_MD_NONE, 0}, @@ -36,10 +34,10 @@ static struct { {"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; - 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; @@ -49,10 +47,8 @@ static bool nametodigest(const char *name, int *algo) { 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; @@ -62,10 +58,8 @@ static bool nidtodigest(int nid, int *algo) { 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; @@ -75,66 +69,118 @@ static bool digesttonid(int algo, int *nid) { return false; } -static bool digest_open(digest_t *digest, int algo) { +static bool digest_open(digest_t *digest, enum gcry_md_algos algo, size_t 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; } - digest->len = gcry_md_get_algo_dlen(algo); + unsigned int len = gcry_md_get_algo_dlen(algo); + + if(maclength > len || maclength < 0) { + digest->maclength = len; + } else { + digest->maclength = maclength; + } + + digest->algo = algo; + digest->hmac = NULL; return true; } -bool digest_open_by_name(digest_t *digest, const char *name) { - 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(LOG_DEBUG, _("Unknown digest name '%s'!"), name); + logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name); return false; } - return digest_open(digest, algo); + return digest_open(digest, algo, maclength); } -bool digest_open_by_nid(digest_t *digest, int nid) { - 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(LOG_DEBUG, _("Unknown digest ID %d!"), nid); + logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid); return false; } - return digest_open(digest, algo); + return digest_open(digest, algo, maclength); } -bool digest_open_sha1(digest_t *digest) { - return digest_open(digest, GCRY_MD_SHA1); +bool digest_open_sha1(digest_t *digest, size_t maclength) { + return digest_open(digest, GCRY_MD_SHA1, maclength); } void digest_close(digest_t *digest) { + if(digest->hmac) { + gcry_md_close(digest->hmac); + } + + memset(digest, 0, sizeof(*digest)); +} + +bool digest_set_key(digest_t *digest, const void *key, size_t len) { + if(!digest->hmac) { + gcry_md_open(&digest->hmac, digest->algo, GCRY_MD_FLAG_HMAC); + } + + if(!digest->hmac) { + return false; + } + + return !gcry_md_setkey(digest->hmac, key, len); } bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) { - gcry_md_hash_buffer(digest->algo, outdata, indata, inlen); + unsigned int len = gcry_md_get_algo_dlen(digest->algo); + + if(digest->hmac) { + uint8_t *tmpdata; + gcry_md_reset(digest->hmac); + gcry_md_write(digest->hmac, indata, inlen); + tmpdata = gcry_md_read(digest->hmac, digest->algo); + + if(!tmpdata) { + return false; + } + + memcpy(outdata, tmpdata, digest->maclength); + } else { + char tmpdata[len]; + gcry_md_hash_buffer(digest->algo, tmpdata, indata, inlen); + memcpy(outdata, tmpdata, digest->maclength); + } + return true; } bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) { - char outdata[digest->len]; + size_t len = digest->maclength; + uint8_t outdata[len]; - gcry_md_hash_buffer(digest->algo, outdata, indata, inlen); - return !memcmp(cmpdata, outdata, digest->len); + return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len); } int digest_get_nid(const digest_t *digest) { + if(!digest || !digest->nid) { + return 0; + } + return digest->nid; } size_t digest_length(const digest_t *digest) { - return digest->len; + if(!digest) { + return 0; + } + + return digest->maclength; } bool digest_active(const digest_t *digest) { - return digest->algo != GCRY_MD_NONE; + return digest && digest->algo != GCRY_MD_NONE; }