add test for serializer

[pam_pcsc_cr.git] / tom_crypto.c

diff --git a/tom_crypto.c b/tom_crypto.c
index 79bd2023f800cc15d694d605a1e8f718b21c9b29..fa4fc5dabb0ae3d10a53c5e4753c6210a8cf2447 100644 (file)
--- a/tom_crypto.c
+++ b/tom_crypto.c
@@ -1,47 +1,81 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <tomcrypt.h>
 
 #include "crypto_if.h"
 
-static int tom_encrypt(void *pt, int ptlen, void *key, int keylen,
-                       void *ct, int *ctlen)
+static const char *tom_init(void)
+{
+       /* nothing to initialize */
+       return "tomcrypt";
+}
+
+static unsigned long tom_encrypt(void *key, int keylen, void *iv,
+                       void *pt, void *ct, int tlen)
 {
        symmetric_CBC cbc;
-       unsigned char iv[16] = {0};
        int index, err;
 
-       if ((index = register_cipher(&aes_desc)) == -1) return -1;
-       // if ((index = find_cipher("aes")) == -1) return -1;
-       // cipher = cipher_descriptor[index];
+       if ((index = register_cipher(&aes_desc)) == -1)
+               return CRYPT_INVALID_CIPHER;
        if ((err = cbc_start(index, iv, key, keylen, 0, &cbc)) != CRYPT_OK)
                return err;
-       if ((err = cbc_encrypt(pt, ct, ptlen, &cbc)) != CRYPT_OK)
-               return err;
-       if ((err = cbc_done(&cbc)) != CRYPT_OK)
-               return err;
-       if ((err = unregister_cipher(&aes_desc)) != CRYPT_OK)
+       err= cbc_encrypt(pt, ct, tlen, &cbc);
+       (void)cbc_done(&cbc);
+       return err;
+}
+
+static unsigned long tom_decrypt(void *key, int keylen, void *iv,
+                       void *ct, void *pt, int tlen)
+{
+       symmetric_CBC cbc;
+       int index, err;
+
+       if ((index = register_cipher(&aes_desc)) == -1)
+               return CRYPT_INVALID_CIPHER;
+       if ((err = cbc_start(index, iv, key, keylen, 0, &cbc)) != CRYPT_OK)
                return err;
-       return 0;
+       err= cbc_decrypt(ct, pt, tlen, &cbc);
+       (void)cbc_done(&cbc);
+       return err;
 }
 
-static int tom_decrypt()
+static unsigned long tom_hash(void *pt, int tlen, void *tag, int *taglen)
 {
-       return 0;
+       int index, rc;
+       unsigned long ltaglen = *taglen;
+
+       if ((index = register_hash(&sha1_desc)) == -1)
+               return CRYPT_INVALID_HASH;
+       rc = hash_memory(index, pt, tlen, tag, &ltaglen);
+       *taglen = ltaglen;
+       return rc;
 }
 
-static int tom_hash()
+static unsigned long tom_hmac(void *key, int keylen,
+                       void *pt, int tlen, void *tag, int *taglen)
 {
-       return 0;
+       int index, rc;
+       unsigned long ltaglen = *taglen;
+
+       if ((index = register_hash(&sha1_desc)) == -1)
+               return CRYPT_INVALID_HASH;
+       rc = hmac_memory(index, key, keylen, pt, tlen, tag, &ltaglen);
+       *taglen = ltaglen;
+       return rc;
 }
 
-static int tom_hmac()
+static const char *tom_errstr(unsigned long err)
 {
-       return 0;
+       return error_to_string((int)err);
 }
 
 struct crypto_interface tom_crypto_if = {
-       .name           = "tomcrypt",
+       .init           = tom_init,
        .encrypt        = tom_encrypt,
        .decrypt        = tom_decrypt,
        .hash           = tom_hash,
        .hmac           = tom_hmac,
+       .errstr         = tom_errstr,
 };