2 files changed, 20 insertions, 3 deletions

diff --git a/tools/tools/crypto/Makefile b/tools/tools/crypto/Makefile
index 8dda3558acc7..afefbe6c6afa 100644
--- a/tools/tools/crypto/Makefile
+++ b/tools/tools/crypto/Makefile
@@ -1,17 +1,33 @@
 #	$FreeBSD$
 
-ALL=	cryptotest cryptokeytest cryptostats
+ALL=	cryptotest cryptokeytest cryptostats \
+	ubsecstats hifnstats ipsecstats
 
 all:	${ALL}
 
+# program to test symmetric crypto functions
 cryptotest: cryptotest.c
 	${CC} -o cryptotest cryptotest.c
 
+# program to test asymmetric crypto functions
 cryptokeytest: cryptokeytest.c
 	${CC} -o cryptokeytest cryptokeytest.c -lcrypto
 
+# program to dump statistics kept by the core crypto code
 cryptostats: cryptostats.c
 	${CC} -o cryptostats cryptostats.c
 
+# program to print statistics kept by the Broadcom driver
+ubsecstats: ubsecstats.c
+	${CC} -o ubsecstats ubsecstats.c
+
+# program to print statistics kept by the HIFN driver
+hifnstats: hifnstats.c
+	${CC} -o hifnstats hifnstats.c
+
+# program to print statistics kept by fast ipsec
+ipsecstats: ipsecstats.c
+	${CC} -o ipsecstats ipsecstats.c
+
 clean:
 	rm -f ${ALL} core a.out
diff --git a/tools/tools/crypto/ubsecstats.c b/tools/tools/crypto/ubsecstats.c
index ebf7c526acba..91b88c022a43 100644
--- a/tools/tools/crypto/ubsecstats.c
+++ b/tools/tools/crypto/ubsecstats.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
 
 	slen = sizeof (stats);
 	if (sysctlbyname("hw.ubsec.stats", &stats, &slen, NULL, NULL) < 0)
-		err(1, "kern.ubsec_stats");
+		err(1, "hw.ubsec.stats");
 
 	printf("input %llu bytes %u packets\n",
 		stats.hst_ibytes, stats.hst_ipackets);
@@ -49,7 +49,8 @@ main(int argc, char *argv[])
 	printf("invalid %u badsession %u badflags %u\n",
 		stats.hst_invalid, stats.hst_badsession, stats.hst_badflags);
 	printf("nodesc %u badalg %u nomem %u queuefull %u\n",
-		stats.hst_badalg, stats.hst_nomem, stats.hst_queuefull);
+		stats.hst_nodesc, stats.hst_badalg,
+		stats.hst_nomem, stats.hst_queuefull);
 	printf("dmaerr %u mcrerr %u nodmafree %u\n",
 		stats.hst_dmaerr, stats.hst_mcrerr, stats.hst_nodmafree);
 	printf("lenmismatch %u skipmisatch %u iovmisalined %u\n",