X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=ossl_crypto.c;h=837fac0e553f5ecaf512711d6a954abacaa2a8d7;hp=b1f3aec20bcccc6b84df1313f83067a20a96e901;hb=7d93eea67d10d01d129f5434ddc8bc4a4f3060d8;hpb=3a6f66a41cbe4e700bf244a3a734536752126620

diff --git a/ossl_crypto.c b/ossl_crypto.c
index b1f3aec..837fac0 100644
--- a/ossl_crypto.c
+++ b/ossl_crypto.c
@@ -1,3 +1,26 @@
+/*
+Copyright (c) 2013 Eugene Crosser
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment in the product documentation
+    would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -47,12 +70,24 @@ static unsigned long ossl_hash(void *pt, int tlen, void *tag, int *taglen)
 	return 0UL;
 }
 
-static unsigned long ossl_hmac(void *pt, int tlen, void *key, int keylen,
+static unsigned long ossl_hmac(void *key, int keylen, void *pt, int tlen,
 			void *tag, int *taglen)
 {
-	if (!HMAC(EVP_sha1(), key, keylen, pt, tlen,
-				tag, (unsigned int *)taglen))
-			return ERR_get_error();
+#if 1
+	HMAC_CTX hctx;
+
+	HMAC_CTX_init(&hctx);
+	if (!HMAC_Init_ex(&hctx, key, keylen, EVP_sha1(), NULL))
+		return ERR_get_error();
+	if (!HMAC_Update(&hctx, pt, tlen)) return ERR_get_error();
+	if (!HMAC_Final(&hctx, tag, (unsigned int *)taglen))
+		return ERR_get_error();
+	HMAC_CTX_cleanup(&hctx);
+#else
+	if (HMAC(EVP_sha1(), key, keylen, pt, tlen,
+				tag, (unsigned int *)taglen) != tag)
+		return ERR_get_error();
+#endif
 	return 0UL;
 }