X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=crypto.c;h=6456932aaea06d7533775db27ff642be85588e44;hp=003cc0f82da5a8f9dd51ef9abc74eab7b74caf5d;hb=f105814a0f4a644d19027f92b90f2445f0366bd2;hpb=724570ad4aaaa5eb67fe0e808d638321d522eba7 diff --git a/crypto.c b/crypto.c index 003cc0f..6456932 100644 --- a/crypto.c +++ b/crypto.c @@ -21,46 +21,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); }