Don't assume sa.sa_family is a short int.

[tinc] / src / openssl / digest.c

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 7c4dfc2..0e600b9 100644 (file)
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -1,6 +1,6 @@
 /*
     digest.c -- Digest handling
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2013 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
@@ -12,73 +12,129 @@
     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 <openssl/err.h>
+#include <openssl/hmac.h>
 
 #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);
 
-bool digest_open_by_name(digest_t *digest, const char *name) {
-       digest->digest = EVP_get_digestbyname(name);
-       if(digest->digest)
-               return true;
+       if(maclength > digestlen || maclength < 0)
+               digest->maclength = digestlen;
+       else
+               digest->maclength = maclength;
 
-       logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
-       return false;
+       return digest;
 }
 
-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_name(const char *name, int maclength) {
+       const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
-       logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
-       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_sha1(digest_t *digest) {
-       digest->digest = EVP_sha1();
-       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;
+       }
+
+       return digest_open(evp_md, maclength);
 }
 
-void digest_close(digest_t *digest) {
+digest_t *digest_open_sha1(int maclength) {
+       return digest_open(EVP_sha1(), 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;
+       return true;
 }
 
-bool digest_create(digest_t *digest, void *indata, size_t inlen, void *outdata) {
-       EVP_MD_CTX ctx;
+void digest_close(digest_t *digest) {
+       if(!digest)
+               return;
 
-       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;
+       free(digest->key);
+       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->key) {
+               if(!HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, 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(!EVP_DigestInit(&ctx, digest->digest)
+                               || !EVP_DigestUpdate(&ctx, indata, inlen)
+                               || !EVP_DigestFinal(&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 digest->digest->type;
+}
+
+size_t digest_keylength(const digest_t *digest) {
+       if(!digest || !digest->digest)
+               return 0;
+
+       return digest->digest->md_size;
 }
 
 size_t digest_length(const digest_t *digest) {
-       return EVP_MD_size(digest->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 && digest->digest->type != 0;
 }