X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=crypto.c;h=105db4e727cf43220bfe4d341ed138230cc2480a;hp=282a713d494517afef007f57212df40691b264ca;hb=3192bff3cc2b10a7b65d185ec1bc8bf31fd4f635;hpb=740b870a7a4d1936991d856f5427e4c10c2c849a

diff --git a/crypto.c b/crypto.c
index 282a713..105db4e 100644
--- a/crypto.c
+++ b/crypto.c
@@ -1,9 +1,13 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <assert.h>
 #include "crypto.h"
 #include "crypto_if.h"
 
 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
@@ -11,6 +15,9 @@ static struct crypto_interface *ifs[] = {
 #endif
 #ifdef HAVE_TOMCRYPT
 	&tom_crypto_if,
+#endif
+#ifdef HAVE_GCRYPT
+	&gnu_crypto_if,
 #endif
 	(void*)0,
 };
@@ -18,41 +25,50 @@ static struct crypto_interface *ifs[] = {
 
 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;
 }
 
-static unsigned char iv[16] = {0};
+const char *crypto_init(const int ifno)
+{
+	if (ifno < 0 || ifno > MAX_IF) return (const char *)0;
+	return ifs[ifno]->init();
+}
 
-unsigned long encrypt(void *key, int keylen, void *pt, void *ct, int tlen)
+#define INITIV {0}
+
+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(keylen == 20);
 	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);
 }