wip single-function authobj

[pam_pcsc_cr.git] / crypto.c

diff --git a/crypto.c b/crypto.c
index 003cc0f82da5a8f9dd51ef9abc74eab7b74caf5d..105db4e727cf43220bfe4d341ed138230cc2480a 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -7,6 +7,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
@@ -14,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,
 };
@@ -21,46 +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;
 }
 
-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);
 }