X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=crypto.c;h=c2d6c1471f349dfee3ba981e0997c5a809f296c0;hp=83ba4efd1d35d0ae618f6cd0f1353b0568075b83;hb=92242efeec6fd187fbbe4701c0dc33975c137d2e;hpb=582620961e80e33514b39ab76648be761fd55368

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