X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=crypto.c;h=cb996e870f71cf011bd41b4b159528bb5f35f825;hp=105db4e727cf43220bfe4d341ed138230cc2480a;hb=HEAD;hpb=9cfb078547dfafdb01cfd87c05acffdbc07255ee

diff --git a/crypto.c b/crypto.c
index 105db4e..afd9ee1 100644
--- a/crypto.c
+++ b/crypto.c
@@ -1,6 +1,30 @@
+/*
+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 <stddef.h>
 #include <assert.h>
 #include "crypto.h"
 #include "crypto_if.h"
@@ -19,9 +43,9 @@ static struct crypto_interface *ifs[] = {
 #ifdef HAVE_GCRYPT
 	&gnu_crypto_if,
 #endif
-	(void*)0,
+	(struct crypto_interface *)0,
 };
-#define MAX_IF (sizeof(ifs)/sizeof(struct crypto_interface *)-2)
+#define MAX_IF (int)(sizeof(ifs)/sizeof(struct crypto_interface *)-2)
 
 static int which = 0;
 
@@ -40,7 +64,7 @@ const char *crypto_init(const int ifno)
 
 #define INITIV {0}
 
-unsigned long encrypt(const void *key, const int keylen, const void *pt, void *ct, const int tlen)
+unsigned long encrypt(const void *key, const size_t keylen, const void *pt, void *ct, const size_t tlen)
 {
 	unsigned char iv[16] = INITIV;
 
@@ -48,7 +72,7 @@ unsigned long encrypt(const void *key, const int keylen, const void *pt, void *c
 	return ifs[which]->encrypt(key, keylen, iv, pt, ct, tlen);
 }
 
-unsigned long decrypt(const void *key, const int keylen, const void *ct, void *pt, const int tlen)
+unsigned long decrypt(const void *key, const size_t keylen, const void *ct, void *pt, const size_t tlen)
 {
 	unsigned char iv[16] = INITIV;
 
@@ -56,13 +80,13 @@ unsigned long decrypt(const void *key, const int keylen, const void *ct, void *p
 	return ifs[which]->decrypt(key, keylen, iv, ct, pt, tlen);
 }
 
-unsigned long hash(const void *pt, const int tlen, void *tag, int *taglen)
+unsigned long hash(const void *pt, const size_t tlen, void *tag, size_t *taglen)
 {
 	assert(*taglen == 20);
 	return ifs[which]->hash(pt, tlen, tag, taglen);
 }
 
-unsigned long hmac(const void *key, const int keylen, const void *pt, const int tlen, void *tag, int *taglen)
+unsigned long hmac(const void *key, const size_t keylen, const void *pt, const size_t tlen, void *tag, size_t *taglen)
 {
 	assert(*taglen == 20);
 	return ifs[which]->hmac(key, keylen, pt, tlen, tag, taglen);