X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=tom_crypto.c;h=b5bed3e06d0fe5da41293903ded63b15f281c8dc;hp=97a18e19fafcab5169b3963a7310a1befccd3388;hb=f6b4fd086473f179295386fb47fd422f47015d16;hpb=740b870a7a4d1936991d856f5427e4c10c2c849a

diff --git a/tom_crypto.c b/tom_crypto.c
index 97a18e1..b5bed3e 100644
--- a/tom_crypto.c
+++ b/tom_crypto.c
@@ -1,9 +1,41 @@
+/*
+Copyright (c) 2013 Eugene Crosser
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment in the product documentation
+    would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <tomcrypt.h>
 
 #include "crypto_if.h"
 
-static unsigned long tom_encrypt(void *key, int keylen, void *iv,
-			void *pt, void *ct, int tlen)
+static const char *tom_init(void)
+{
+	/* nothing to initialize */
+	return "tomcrypt";
+}
+
+static unsigned long tom_encrypt(const void *key, const int keylen, void *iv,
+			const void *pt, void *ct, const int tlen)
 {
 	symmetric_CBC cbc;
 	int index, err;
@@ -17,8 +49,8 @@ static unsigned long tom_encrypt(void *key, int keylen, void *iv,
 	return err;
 }
 
-static unsigned long tom_decrypt(void *key, int keylen, void *iv,
-			void *ct, void *pt, int tlen)
+static unsigned long tom_decrypt(const void *key, const int keylen, void *iv,
+			const void *ct, void *pt, const int tlen)
 {
 	symmetric_CBC cbc;
 	int index, err;
@@ -32,7 +64,8 @@ static unsigned long tom_decrypt(void *key, int keylen, void *iv,
 	return err;
 }
 
-static unsigned long tom_hash(void *pt, int tlen, void *tag, int *taglen)
+static unsigned long tom_hash(const void *pt, const int tlen,
+			void *tag, int *taglen)
 {
 	int index, rc;
 	unsigned long ltaglen = *taglen;
@@ -44,13 +77,13 @@ static unsigned long tom_hash(void *pt, int tlen, void *tag, int *taglen)
 	return rc;
 }
 
-static unsigned long tom_hmac(void *key, int keylen,
-			void *pt, int tlen, void *tag, int *taglen)
+static unsigned long tom_hmac(const void *key, const int keylen,
+			const void *pt, const int tlen,
+			void *tag, int *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);
@@ -58,13 +91,13 @@ static unsigned long tom_hmac(void *key, int keylen,
 	return rc;
 }
 
-static const char *tom_errstr(unsigned long err)
+static const char *tom_errstr(const unsigned long err)
 {
 	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,