X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=crypto.c;h=cb996e870f71cf011bd41b4b159528bb5f35f825;hp=003cc0f82da5a8f9dd51ef9abc74eab7b74caf5d;hb=b4bd8dfd5d7780bc00f820c3dec7b2a06f47b514;hpb=724570ad4aaaa5eb67fe0e808d638321d522eba7

diff --git a/crypto.c b/crypto.c
index 003cc0f..cb996e8 100644
--- a/crypto.c
+++ b/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
@@ -7,6 +30,7 @@
 
 extern struct crypto_interface ossl_crypto_if;
 extern struct crypto_interface tom_crypto_if;
+extern struct crypto_interface gnu_crypto_if;
 
 static struct crypto_interface *ifs[] = {
 #ifdef HAVE_OPENSSL
@@ -15,52 +39,59 @@ static struct crypto_interface *ifs[] = {
 #ifdef HAVE_TOMCRYPT
 	&tom_crypto_if,
 #endif
-	(void*)0,
+#ifdef HAVE_GCRYPT
+	&gnu_crypto_if,
+#endif
+	(struct crypto_interface *)0,
 };
 #define MAX_IF (sizeof(ifs)/sizeof(struct crypto_interface *)-2)
 
 static int which = 0;
 
-int select_crypto_if(int ifno)
+int select_crypto_if(const int ifno)
 {
 	if (ifno < 0 || ifno > MAX_IF) return -1;
 	which = ifno;
 	return 0;
 }
 
-const char *crypto_init(int ifno)
+const char *crypto_init(const int ifno)
 {
 	if (ifno < 0 || ifno > MAX_IF) return (const char *)0;
 	return ifs[ifno]->init();
 }
 
-static unsigned char iv[16] = {0};
+#define INITIV {0}
 
-unsigned long encrypt(void *key, int keylen, void *pt, void *ct, int tlen)
+unsigned long encrypt(const void *key, const int keylen, const void *pt, void *ct, const int tlen)
 {
+	unsigned char iv[16] = INITIV;
+
 	assert(keylen == 16);
 	return ifs[which]->encrypt(key, keylen, iv, pt, ct, tlen);
 }
 
-unsigned long decrypt(void *key, int keylen, void *ct, void *pt, int tlen)
+unsigned long decrypt(const void *key, const int keylen, const void *ct, void *pt, const int tlen)
 {
+	unsigned char iv[16] = INITIV;
+
 	assert(keylen == 16);
 	return ifs[which]->decrypt(key, keylen, iv, ct, pt, tlen);
 }
 
-unsigned long hash(void *pt, int tlen, void *tag, int *taglen)
+unsigned long hash(const void *pt, const int tlen, void *tag, int *taglen)
 {
 	assert(*taglen == 20);
 	return ifs[which]->hash(pt, tlen, tag, taglen);
 }
 
-unsigned long hmac(void *key, int keylen, void *pt, int tlen, void *tag, int *taglen)
+unsigned long hmac(const void *key, const int keylen, const void *pt, const int tlen, void *tag, int *taglen)
 {
 	assert(*taglen == 20);
 	return ifs[which]->hmac(key, keylen, pt, tlen, tag, taglen);
 }
 
-const char *crypto_errstr(unsigned long err)
+const char *crypto_errstr(const unsigned long err)
 {
 	return ifs[which]->errstr(err);
 }