X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=ossl_crypto.c;h=4b475a4fcbe807d0e0d0894027873764861dba12;hp=a7fc515b5db6f5642c77fd756f8f28d7d286799f;hb=724570ad4aaaa5eb67fe0e808d638321d522eba7;hpb=740b870a7a4d1936991d856f5427e4c10c2c849a

diff --git a/ossl_crypto.c b/ossl_crypto.c
index a7fc515..4b475a4 100644
--- a/ossl_crypto.c
+++ b/ossl_crypto.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <openssl/err.h>
 #include <openssl/sha.h>
 #include <openssl/evp.h>
@@ -5,6 +8,12 @@
 
 #include "crypto_if.h"
 
+static const char *ossl_init(void)
+{
+	ERR_load_crypto_strings();
+	return "openssl";
+}
+
 static unsigned long ossl_encrypt(void *key, int keylen, void *iv,
 			void *pt, void *ct, int tlen)
 {
@@ -20,7 +29,11 @@ static unsigned long ossl_encrypt(void *key, int keylen, void *iv,
 		return ERR_get_error();
 	if (!EVP_EncryptFinal(&ctx, ct + outlen1, &outlen2))
 		return ERR_get_error();
-	if (outlen1 + outlen2 != tlen) return 1UL;
+	if (outlen1 + outlen2 != tlen) {
+		printf("enc tlen =%d outlen1=%d outlen2=%d\n",
+			tlen, outlen1, outlen2);
+		// return 1UL;
+	}
 	return 0UL;
 }
 
@@ -39,7 +52,11 @@ static unsigned long ossl_decrypt(void *key, int keylen, void *iv,
 		return ERR_get_error();
 	if (!EVP_DecryptFinal(&ctx, ct + outlen1, &outlen2))
 		return ERR_get_error();
-	if (outlen1 + outlen2 != tlen) return 1UL;
+	if (outlen1 + outlen2 != tlen) {
+		printf("dec tlen =%d outlen1=%d outlen2=%d\n",
+			tlen, outlen1, outlen2);
+		// return 1UL;
+	}
 	return 0UL;
 }
 
@@ -50,21 +67,16 @@ static unsigned long ossl_hash(void *pt, int tlen, void *tag, int *taglen)
 	if (!SHA1_Init(&sctx)) return ERR_get_error();
 	if (!SHA1_Update(&sctx, pt, tlen)) return ERR_get_error();
 	if (!SHA1_Final(tag, &sctx)) return ERR_get_error();
-	*taglen = 160;
+	*taglen = 20;
 	return 0UL;
 }
 
 static unsigned long ossl_hmac(void *pt, int tlen, void *key, int keylen,
 			void *tag, int *taglen)
 {
-	HMAC_CTX hctx;
-
-	HMAC_CTX_init(&hctx);
-	if (!HMAC_Init(&hctx, key, keylen, EVP_sha1())) 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);
+	if (!HMAC(EVP_sha1(), key, keylen, pt, tlen,
+				tag, (unsigned int *)taglen))
+			return ERR_get_error();
 	return 0UL;
 }
 
@@ -74,7 +86,7 @@ static const char *ossl_errstr(unsigned long err)
 }
 
 struct crypto_interface ossl_crypto_if = {
-	.name		= "openssl",
+	.init		= ossl_init,
 	.encrypt	= ossl_encrypt,
 	.decrypt	= ossl_decrypt,
 	.hash		= ossl_hash,