X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenssl%2Fdigest.c;h=9569f3cc64c40419be97a89dde6b15f547125a6f;hb=7761a6992025ef06bf8dbf88d39a3bf9e459346a;hp=7c4dfc238da8f9726408b95ea519af0b8876e57f;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc diff --git a/src/openssl/digest.c b/src/openssl/digest.c index 7c4dfc23..9569f3cc 100644 --- a/src/openssl/digest.c +++ b/src/openssl/digest.c @@ -1,6 +1,6 @@ /* digest.c -- Digest handling - Copyright (C) 2007 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 @@ -12,73 +12,160 @@ 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" +#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; + + int digestlen = EVP_MD_size(digest->digest); + + if(maclength > digestlen || maclength < 0) { + digest->maclength = digestlen; + } else { + digest->maclength = maclength; + } + + return digest; +} -bool digest_open_by_name(digest_t *digest, const char *name) { - digest->digest = EVP_get_digestbyname(name); - if(digest->digest) - return true; +digest_t *digest_open_by_name(const char *name, int maclength) { + const EVP_MD *evp_md = EVP_get_digestbyname(name); - logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name); - return false; + if(!evp_md) { + logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name); + return false; + } + + return digest_open(evp_md, maclength); } -bool digest_open_by_nid(digest_t *digest, int nid) { - digest->digest = EVP_get_digestbynid(nid); - if(digest->digest) - return true; +digest_t *digest_open_by_nid(int nid, int maclength) { + const EVP_MD *evp_md = EVP_get_digestbynid(nid); + + if(!evp_md) { + logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest nid %d!", nid); + return false; + } - logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid); - return false; + return digest_open(evp_md, maclength); } -bool digest_open_sha1(digest_t *digest) { - digest->digest = EVP_sha1(); +bool digest_set_key(digest_t *digest, const void *key, size_t 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) { -} + if(!digest) { + return; + } + + if(digest->md_ctx) { + EVP_MD_CTX_destroy(digest->md_ctx); + } -bool digest_create(digest_t *digest, void *indata, size_t inlen, void *outdata) { - EVP_MD_CTX ctx; +#ifdef HAVE_HMAC_CTX_NEW - if(EVP_DigestInit(&ctx, digest->digest) - && EVP_DigestUpdate(&ctx, indata, inlen) - && EVP_DigestFinal(&ctx, outdata, NULL)) - return true; - - logger(LOG_DEBUG, _("Error creating digest: %s"), ERR_error_string(ERR_get_error(), NULL)); - return false; + if(digest->hmac_ctx) { + HMAC_CTX_free(digest->hmac_ctx); + } + +#else + free(digest->hmac_ctx); +#endif + + free(digest); } -bool digest_verify(digest_t *digest, void *indata, size_t inlen, void *cmpdata) { +bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) { size_t len = EVP_MD_size(digest->digest); - char outdata[len]; + unsigned char tmpdata[len]; + + 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 { + if(!digest->md_ctx) { + digest->md_ctx = EVP_MD_CTX_create(); + } + + 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; + } + } + + memcpy(outdata, tmpdata, digest->maclength); + return true; +} + +bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) { + size_t len = digest->maclength; + unsigned char outdata[len]; - return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len); + return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, digest->maclength); } 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_length(const digest_t *digest) { +size_t digest_keylength(const digest_t *digest) { + 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; }