X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=9569f3cc64c40419be97a89dde6b15f547125a6f;hp=79db491d67fd1bcc4838494f56f84f247dbb6025;hb=7761a6992025ef06bf8dbf88d39a3bf9e459346a;hpb=70a1a5594af5d4e6a364186b42ba4e34c676009b diff --git a/src/openssl/digest.c b/src/openssl/digest.c index 79db491d..9569f3cc 100644 --- a/src/openssl/digest.c +++ b/src/openssl/digest.c @@ -1,6 +1,6 @@ /* digest.c -- Digest handling - Copyright (C) 2007-2012 Guus Sliepen + Copyright (C) 2007-2016 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 @@ -17,83 +17,115 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "system.h" -#include "utils.h" -#include "xalloc.h" +#include "../system.h" +#include "../utils.h" +#include "../xalloc.h" #include #include #include "digest.h" -#include "logger.h" +#include "../digest.h" +#include "../logger.h" + +static digest_t *digest_open(const EVP_MD *evp_md, int maclength) { + digest_t *digest = xzalloc(sizeof(*digest)); + digest->digest = evp_md; -static void set_maclength(digest_t *digest, int maclength) { int digestlen = EVP_MD_size(digest->digest); - if(maclength > digestlen || maclength < 0) + if(maclength > digestlen || maclength < 0) { digest->maclength = digestlen; - else + } else { digest->maclength = maclength; + } + + return digest; } -bool digest_open_by_name(digest_t *digest, const char *name, int maclength) { - digest->digest = EVP_get_digestbyname(name); - digest->key = NULL; +digest_t *digest_open_by_name(const char *name, int maclength) { + const EVP_MD *evp_md = EVP_get_digestbyname(name); - if(!digest->digest) { + if(!evp_md) { logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name); return false; } - set_maclength(digest, maclength); - return true; + return digest_open(evp_md, maclength); } -bool digest_open_by_nid(digest_t *digest, int nid, int maclength) { - digest->digest = EVP_get_digestbynid(nid); - digest->key = NULL; +digest_t *digest_open_by_nid(int nid, int maclength) { + const EVP_MD *evp_md = EVP_get_digestbynid(nid); - if(!digest->digest) { + if(!evp_md) { logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest nid %d!", nid); return false; } - set_maclength(digest, maclength); - return true; -} - -bool digest_open_sha1(digest_t *digest, int maclength) { - digest->digest = EVP_sha1(); - digest->key = NULL; - - set_maclength(digest, maclength); - return true; + return digest_open(evp_md, maclength); } bool digest_set_key(digest_t *digest, const void *key, size_t len) { - digest->key = xrealloc(digest->key, len); - memcpy(digest->key, key, len); - digest->keylength = len; +#ifdef HAVE_HMAC_CTX_NEW + digest->hmac_ctx = HMAC_CTX_new(); + HMAC_Init_ex(digest->hmac_ctx, key, len, digest->digest, NULL); +#else + digest->hmac_ctx = xzalloc(sizeof(*digest->hmac_ctx)); + HMAC_Init(digest->hmac_ctx, key, len, digest->digest); +#endif + + if(!digest->hmac_ctx) { + abort(); + } + return true; } void digest_close(digest_t *digest) { - free(digest->key); - digest->key = NULL; + if(!digest) { + return; + } + + if(digest->md_ctx) { + EVP_MD_CTX_destroy(digest->md_ctx); + } + +#ifdef HAVE_HMAC_CTX_NEW + + if(digest->hmac_ctx) { + HMAC_CTX_free(digest->hmac_ctx); + } + +#else + free(digest->hmac_ctx); +#endif + + free(digest); } bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) { size_t len = EVP_MD_size(digest->digest); unsigned char tmpdata[len]; - if(digest->key) { - HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, tmpdata, NULL); + if(digest->hmac_ctx) { + if(!HMAC_Init_ex(digest->hmac_ctx, NULL, 0, NULL, NULL) + || !HMAC_Update(digest->hmac_ctx, indata, inlen) + || !HMAC_Final(digest->hmac_ctx, tmpdata, NULL)) { + logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL)); + return false; + } } else { - EVP_MD_CTX ctx; + if(!digest->md_ctx) { + digest->md_ctx = EVP_MD_CTX_create(); + } - if(!EVP_DigestInit(&ctx, digest->digest) - || !EVP_DigestUpdate(&ctx, indata, inlen) - || !EVP_DigestFinal(&ctx, tmpdata, NULL)) { + if(!digest->md_ctx) { + abort(); + } + + if(!EVP_DigestInit(digest->md_ctx, digest->digest) + || !EVP_DigestUpdate(digest->md_ctx, indata, inlen) + || !EVP_DigestFinal(digest->md_ctx, tmpdata, NULL)) { logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL)); return false; } @@ -111,17 +143,29 @@ bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const voi } int digest_get_nid(const digest_t *digest) { - return digest->digest ? digest->digest->type : 0; + if(!digest || !digest->digest) { + return 0; + } + + return EVP_MD_type(digest->digest); } size_t digest_keylength(const digest_t *digest) { - return digest->digest->md_size; + if(!digest || !digest->digest) { + return 0; + } + + return EVP_MD_size(digest->digest); } size_t digest_length(const digest_t *digest) { + if(!digest) { + return 0; + } + return digest->maclength; } bool digest_active(const digest_t *digest) { - return digest->digest && digest->digest->type != 0; + return digest && digest->digest && EVP_MD_type(digest->digest) != 0; }