X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=test_crypto.c;h=f9099a278698c6fb7d5dccaf857c59c671e01850;hp=3654fa287259108a326f9ccc46290882f82ed9bd;hb=HEAD;hpb=724570ad4aaaa5eb67fe0e808d638321d522eba7

diff --git a/test_crypto.c b/test_crypto.c
index 3654fa2..7199a9c 100644
--- a/test_crypto.c
+++ b/test_crypto.c
@@ -1,3 +1,26 @@
+/*
+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
@@ -10,7 +33,7 @@
 #define printh(x) printh_f(#x, x, sizeof(x))
 void printh_f(char *p, unsigned char *x, size_t l)
 {
-	int i;
+	size_t i;
 	printf("%s:", p);
 	for (i=0; i<l; i++) printf(" %02x", x[i]);
 	printf("\n");
@@ -36,6 +59,7 @@ int test_enc_dec(int iface1, int iface2)
 	}
 	printh(ct);
 	if (select_crypto_if(iface2)) return 1;
+	memset(re, 0xab, sizeof(re));
 	if ((err = decrypt(key, sizeof(key), ct, re, sizeof(re)))) {
 		printf("decrypt error: %s\n", crypto_errstr(err));
 		return 1;
@@ -52,18 +76,19 @@ int test_sha(int iface)
 {
 	unsigned char sha1[20];
 	unsigned long err;
-	int shalen;
+	size_t shalen;
 	unsigned char spt[3] = "abc";
 	unsigned char sstd[20] = {0xA9,0x99,0x3E,0x36,0x47,0x06,0x81,0x6A,
 		0xBA,0x3E,0x25,0x71,0x78,0x50,0xC2,0x6C,0x9C,0xD0,0xD8,0x9D};
 
 	if (select_crypto_if(iface)) return 1;
-	shalen = 20;
+	memset(sha1, 0, sizeof(sha1));
+	shalen = sizeof(sha1);
 	if ((err = hash(spt, sizeof(spt), sha1, &shalen))) {
 		printf("hash error: %s\n", crypto_errstr(err));
 		return 1;
 	}
-	printf("%d: len=%d ", iface, shalen);
+	printf("%d: len=%d ", iface, (int)shalen);
 	printh(sha1);
 	if (memcmp(sha1, sstd, sizeof(sstd))) {
 		printf("fail\n");
@@ -76,20 +101,21 @@ int test_hmac(int iface)
 {
 	unsigned char hmac1[20];
 	unsigned long err;
-	int hmaclen;
+	size_t hmaclen;
 	unsigned char hpt[28] = "what do ya want for nothing?";
 	unsigned char hkey[4] = "Jefe";
 	unsigned char hstd[20] = {0xef,0xfc,0xdf,0x6a,0xe5,0xeb,0x2f,0xa2,
 		0xd2,0x74,0x16,0xd5,0xf1,0x84,0xdf,0x9c,0x25,0x9a,0x7c,0x79};
 
 	if (select_crypto_if(iface)) return 1;
-	hmaclen = 20;
+	memset(hmac1, 0, sizeof(hmac1));
+	hmaclen = sizeof(hmac1);
 	if ((err = hmac(hkey, sizeof(hkey), hpt, sizeof(hpt),
 						hmac1, &hmaclen))) {
 		printf("hash error: %s\n", crypto_errstr(err));
 		return 1;
 	}
-	printf("%d: len=%d ", iface, hmaclen);
+	printf("%d: len=%d ", iface, (int)hmaclen);
 	printh(hmac1);
 	if (memcmp(hmac1, hstd, sizeof(hstd))) {
 		printf("fail\n");