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

diff --git a/ossl_crypto.c b/ossl_crypto.c
index a7fc515..e0e10bc 100644
--- a/ossl_crypto.c
+++ b/ossl_crypto.c
@@ -1,80 +1,105 @@
+/*
+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
 #include <openssl/err.h>
+#include <openssl/aes.h>
 #include <openssl/sha.h>
-#include <openssl/evp.h>
 #include <openssl/hmac.h>
 
 #include "crypto_if.h"
 
-static unsigned long ossl_encrypt(void *key, int keylen, void *iv,
-			void *pt, void *ct, int tlen)
+static const char *ossl_init(void)
 {
-	EVP_CIPHER_CTX ctx;
-	int outlen1, outlen2;
-	unsigned char hkey[16];
+	ERR_load_crypto_strings();
+	return "openssl";
+}
 
-	if (EVP_BytesToKey(EVP_aes_128_cbc(), EVP_sha1(),
-			NULL, key, keylen, 5, hkey, NULL) != 16) return 1UL;
-	if (!EVP_EncryptInit(&ctx, EVP_aes_128_cbc(), hkey, iv))
-		return ERR_get_error();
-	if (!EVP_EncryptUpdate(&ctx, ct, &outlen1, pt, tlen))
-		return ERR_get_error();
-	if (!EVP_EncryptFinal(&ctx, ct + outlen1, &outlen2))
+static unsigned long ossl_encrypt(const void *key, const int keylen, void *iv,
+			const void *pt, void *ct, const int tlen)
+{
+	AES_KEY akey;
+
+	if (AES_set_encrypt_key(key, keylen*8, &akey))
 		return ERR_get_error();
-	if (outlen1 + outlen2 != tlen) return 1UL;
+	AES_cbc_encrypt(pt, ct, tlen, &akey, iv, AES_ENCRYPT);
 	return 0UL;
 }
 
-static unsigned long ossl_decrypt(void *key, int keylen, void *iv,
-			void *ct, void *pt, int tlen)
+static unsigned long ossl_decrypt(const void *key, const int keylen, void *iv,
+			const void *ct, void *pt, const int tlen)
 {
-	EVP_CIPHER_CTX ctx;
-	int outlen1, outlen2;
-	unsigned char hkey[16];
+	AES_KEY akey;
 
-	if (EVP_BytesToKey(EVP_aes_128_cbc(), EVP_sha1(),
-			NULL, key, keylen, 5, hkey, NULL) != 16) return 1UL;
-	if (!EVP_DecryptInit(&ctx, EVP_aes_128_cbc(), hkey, iv))
-		return ERR_get_error();
-	if (!EVP_DecryptUpdate(&ctx, ct, &outlen1, pt, tlen))
+	if (AES_set_decrypt_key(key, keylen*8, &akey))
 		return ERR_get_error();
-	if (!EVP_DecryptFinal(&ctx, ct + outlen1, &outlen2))
-		return ERR_get_error();
-	if (outlen1 + outlen2 != tlen) return 1UL;
+	AES_cbc_encrypt(ct, pt, tlen, &akey, iv, AES_DECRYPT);
 	return 0UL;
 }
 
-static unsigned long ossl_hash(void *pt, int tlen, void *tag, int *taglen)
+static unsigned long ossl_hash(const void *pt, const int tlen,
+			void *tag, int *taglen)
 {
 	SHA_CTX sctx;
 
 	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 = SHA_DIGEST_LENGTH;
 	return 0UL;
 }
 
-static unsigned long ossl_hmac(void *pt, int tlen, void *key, int keylen,
+static unsigned long ossl_hmac(const void *key, int const keylen,
+			const void *pt, const int tlen,
 			void *tag, int *taglen)
 {
+#if 1
 	HMAC_CTX hctx;
 
 	HMAC_CTX_init(&hctx);
-	if (!HMAC_Init(&hctx, key, keylen, EVP_sha1())) return ERR_get_error();
+	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;
 }
 
-static const char *ossl_errstr(unsigned long err)
+static const char *ossl_errstr(const unsigned long err)
 {
 	return ERR_error_string(err, NULL);
 }
 
 struct crypto_interface ossl_crypto_if = {
-	.name		= "openssl",
+	.init		= ossl_init,
 	.encrypt	= ossl_encrypt,
 	.decrypt	= ossl_decrypt,
 	.hash		= ossl_hash,