From 68f60ba50b605e2a96463ca213cd4bc633b9bcb9 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Sat, 26 Jan 2013 17:40:23 +0530
Subject: [PATCH] Update default checksum to BLAKE256.

---
 crypto/crypto_utils.h | 2 +-
 main.c                | 2 +-
 test/t2.tst           | 2 +-
 test/t5.tst           | 2 +-
 test/t9.tst           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/crypto_utils.h b/crypto/crypto_utils.h
index 99f6c4b..1a0da09 100644
--- a/crypto/crypto_utils.h
+++ b/crypto/crypto_utils.h
@@ -35,7 +35,7 @@ extern "C" {
 #define	MAX_PW_LEN	16
 #define	CKSUM_MASK		0x700
 #define	CKSUM_MAX_BYTES		64
-#define	DEFAULT_CKSUM		"SKEIN256"
+#define	DEFAULT_CKSUM		"BLAKE256"
 
 #define ENCRYPT_FLAG	1
 #define DECRYPT_FLAG	0
diff --git a/main.c b/main.c
index 1d86958..b450e10 100644
--- a/main.c
+++ b/main.c
@@ -2263,7 +2263,7 @@ main(int argc, char *argv[])
 
 		    case 'S':
 			if (get_checksum_props(optarg, &cksum, &cksum_bytes, &mac_bytes, 0) == -1) {
-				err_exit(0, "Invalid checksum type %s", optarg);
+				err_exit(0, "Invalid checksum type %s\n", optarg);
 			}
 			break;
 
diff --git a/test/t2.tst b/test/t2.tst
index ed29804..2b15c68 100644
--- a/test/t2.tst
+++ b/test/t2.tst
@@ -9,7 +9,7 @@ for algo in zlib ppmd
 do
 	for tf in `cat files.lst`
 	do
-		for cksum in CRC64 SHA256 SHA512 SKEIN256 SKEIN512 KECCAK256 KECCAK512
+		for cksum in CRC64 SHA256 SHA512 BLAKE256 BLAKE512 KECCAK256 KECCAK512
 		do
 			cmd="../../pcompress -c ${algo} -l 6 -s 1m -S ${cksum} ${tf}"
 			echo "Running $cmd"
diff --git a/test/t5.tst b/test/t5.tst
index f607d03..81a0a0e 100644
--- a/test/t5.tst
+++ b/test/t5.tst
@@ -10,7 +10,7 @@ do
 	for tf in `cat files.lst`
 	do
 		rm -f ${tf}.*
-		for feat in "-e" "-e -L -S SHA256" "-D -e -S SHA512" "-D -EE -L -e -S SKEIN512" "-e -S CRC64" "-e -P" "-e -L -P -S KECCAK256" "-D -e -L -S KECCAK512"
+		for feat in "-e" "-e -L -S SHA256" "-D -e -S SHA512" "-D -EE -L -e -S BLAKE512" "-e -S CRC64" "-e -P" "-e -L -P -S KECCAK256" "-D -e -L -S KECCAK512"
 		do
 			for seg in 2m 100m
 			do
diff --git a/test/t9.tst b/test/t9.tst
index 8b03204..4b8ec13 100644
--- a/test/t9.tst
+++ b/test/t9.tst
@@ -52,7 +52,7 @@ do
 	done
 done
 
-for feat in "-S CRC64" "-S SKEIN256" "-S SKEIN512" "-S SHA256" "-S SHA512" "-S KECCAK256" "-S KECCAK512"
+for feat in "-S CRC64" "-S BLAKE256" "-S BLAKE512" "-S SHA256" "-S SHA512" "-S KECCAK256" "-S KECCAK512"
 do
 	rm -f ${tstf}.*