 @@ -1,20 +1,20 @@
-#	$NetBSD: Makefile.inc,v 1.7 2002/09/18 04:16:01 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2011/05/14 16:26:23 christos Exp $
 #	$KAME: Makefile.inc,v 1.3 2000/11/08 05:58:24 itojun Exp $
 .if !target(regress)
 .include <bsd.own.mk>
 SYSDIR=	${NETBSDSRCDIR}/sys
-WARNS?=	1
+WARNS?=	4
 regress:
 	@./${PROG}
 BENCHROUNDS?=	10000
 benchmark:
 	@time ./${PROG} ${BENCHROUNDS}
 .endif
 # do not install regression test programs
 proginstall::

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bftest.c,v 1.5 2005/02/06 06:05:19 perry Exp $	*/
+/*	$NetBSD: bftest.c,v 1.6 2011/05/14 16:26:23 christos Exp $	*/
 /*	$KAME: bftest.c,v 1.3 2000/11/08 05:58:24 itojun Exp $	*/
 /*
  * Copyright (C) 2000 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -87,27 +87,27 @@
  * [including the GNU Public Licence.]
  */
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <crypto/blowfish/blowfish.h>
-static char *bf_key[2]={
+static const char *bf_key[2]={
 	"abcdefghijklmnopqrstuvwxyz",
 	"Who is John Galt?"
 };
 /* big endian */
 static const char *bf_plain[2] = {
 	"424c4f5746495348", "fedcba9876543210"
 };
 static const char *bf_cipher[2] = {
 	"324ed0fef413a203", "cc91732b8022f684"
 };
 @@ -155,27 +155,28 @@ main(argc, argv)
 	int n, error = 0;
 	BF_KEY key;
 	BF_LONG data[2], plain[2], cipher[2];
 	int rounds;
 	if (argc > 1)
 		rounds = atoi(argv[1]);
 	else
 		rounds = 1;
 	printf("testing blowfish in raw ecb mode\n");
 again:
 	for (n = 0; n < 2; n++) {
-		BF_set_key(&key, strlen(bf_key[n]), (unsigned char *)bf_key[n]);
+		BF_set_key(&key, strlen(bf_key[n]),
 		    (const unsigned char *)bf_key[n]);
 		hex2bin((u_int8_t *)plain, bf_plain[n]);
 		hex2bin((u_int8_t *)cipher, bf_cipher[n]);
 		memcpy(data, plain, 8);
 		data[0] = (BF_LONG)ntohl(data[0]);
 		data[1] = (BF_LONG)ntohl(data[1]);
 		BF_encrypt(data, &key);
 		data[0] = (BF_LONG)htonl(data[0]);
 		data[1] = (BF_LONG)htonl(data[1]);
 		if (memcmp(data, cipher, 8) != 0) {
 			printf("BF_encrypt error encrypting\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rijndaeltest.c,v 1.7 2006/05/12 01:56:39 mrg Exp $	*/
+/*	$NetBSD: rijndaeltest.c,v 1.8 2011/05/14 16:26:23 christos Exp $	*/
 /*	$KAME: rijndaeltest.c,v 1.7 2001/05/27 01:56:45 itojun Exp $	*/
 /*
  * Copyright (C) 2000 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -82,27 +82,27 @@ struct {
 	NULL, NULL, NULL,
     },
 };
 static void hex2key(u_int8_t *, size_t, const char *);
 int main(int, char **);
 static void
 hex2key(p, l, s)
 	u_int8_t *p;
 	size_t l;
 	const char *s;
+{
-	int i;
+	size_t i;
 	u_int v;
 	for (i = 0; i < l && *s; i++) {
 		sscanf(s, "%02x", &v);
 		*p++ = v & 0xff;
 		s += 2;
+	}
 	if (*s) {
 		errx(1, "hex2key overrun");
 		/*NOTREACHED*/
+	}
+}