[vpnc-devel] svn commit: vpnc r421 - in /trunk: test-crypto.c vpnc.c

[vpnc at unix-ag.uni-kl.de]

Author: Joerg Mayer
Date: Tue Sep  1 02:09:12 2009
New Revision: 421

Log:
Jukka Salmi <j+vpnc at 2009.salmi.ch>

while building vpnc I noticed some printf format errors.  See attached
patch for a fix.


Modified:
    trunk/test-crypto.c
    trunk/vpnc.c

Modified: trunk/test-crypto.c
==============================================================================
--- trunk/test-crypto.c (original)
+++ trunk/test-crypto.c Tue Sep  1 02:09:12 2009
@@ -114,7 +114,7 @@
 
 	if (size != sizeof(dec_data)) {
 		fprintf(stderr, "Error decrypting signature: unexpected "
-		        "decrypted size %lu (expected %lu)\n", size, sizeof(dec_data));
+		        "decrypted size %zd (expected %u)\n", size, sizeof(dec_data));
 		return 1;
 	}
 

Modified: trunk/vpnc.c
==============================================================================
--- trunk/vpnc.c (original)
+++ trunk/vpnc.c Tue Sep  1 02:09:12 2009
@@ -1719,14 +1719,14 @@
 					crypto_call_error(crerr);
 
 				if (decr_size != s->ike.md_len) {
-					printf("Decrypted-Size: %lu\n",decr_size);
+					printf("Decrypted-Size: %zd\n",decr_size);
 					hex_dump("    decr_hash", rec_hash, decr_size, NULL);
 					hex_dump("expected hash", expected_hash, s->ike.md_len, NULL);
 
 					error(2, 0, "The hash-value, which was decrypted from the received signature, and the expected hash-value differ in size.\n");
 				} else {
 					if (memcmp(rec_hash, expected_hash, decr_size) != 0) {
-						printf("Decrypted-Size: %lu\n",decr_size);
+						printf("Decrypted-Size: %zd\n",decr_size);
 						hex_dump("    decr_hash", rec_hash, decr_size, NULL);
 						hex_dump("expected hash", expected_hash, s->ike.md_len, NULL);