fix args order

[pam_pcsc_cr.git] / tom_crypto.c

diff --git a/tom_crypto.c b/tom_crypto.c
index 97a18e19fafcab5169b3963a7310a1befccd3388..fa4fc5dabb0ae3d10a53c5e4753c6210a8cf2447 100644 (file)
--- a/tom_crypto.c
+++ b/tom_crypto.c
@@ -1,7 +1,16 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif

 #include <tomcrypt.h>
 
 #include "crypto_if.h"
 
 #include <tomcrypt.h>
 
 #include "crypto_if.h"
 

+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)
 {
 static unsigned long tom_encrypt(void *key, int keylen, void *iv,
                        void *pt, void *ct, int tlen)
 {


@@ -50,7 +59,6 @@ static unsigned long tom_hmac(void *key, int keylen,
        int index, rc;
        unsigned long ltaglen = *taglen;
 
        int index, rc;
        unsigned long ltaglen = *taglen;
 

-       if (keylen != 20) return CRYPT_INVALID_KEYSIZE;

        if ((index = register_hash(&sha1_desc)) == -1)
                return CRYPT_INVALID_HASH;
        rc = hmac_memory(index, key, keylen, pt, tlen, tag, &ltaglen);
        if ((index = register_hash(&sha1_desc)) == -1)
                return CRYPT_INVALID_HASH;
        rc = hmac_memory(index, key, keylen, pt, tlen, tag, &ltaglen);


@@ -64,7 +72,7 @@ static const char *tom_errstr(unsigned long err)
 }
 
 struct crypto_interface tom_crypto_if = {
 }
 
 struct crypto_interface tom_crypto_if = {

-       .name           = "tomcrypt",
+       .init           = tom_init,

        .encrypt        = tom_encrypt,
        .decrypt        = tom_decrypt,
        .hash           = tom_hash,
        .encrypt        = tom_encrypt,
        .decrypt        = tom_decrypt,
        .hash           = tom_hash,