X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=ossl_crypto.c;h=51594d3ddddf364e7384aa4e596ea600de3269c5;hp=b1f3aec20bcccc6b84df1313f83067a20a96e901;hb=4a5da38dfd8b0236564ffe6b70eab1eeb399fff0;hpb=3a6f66a41cbe4e700bf244a3a734536752126620

diff --git a/ossl_crypto.c b/ossl_crypto.c
index b1f3aec..51594d3 100644
--- a/ossl_crypto.c
+++ b/ossl_crypto.c
@@ -47,12 +47,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;
 }