Module Name: src
Committed By: spz
Date: Thu Jun 9 05:25:22 UTC 2011
Modified Files:
src/tests/crypto/libcrypto: Makefile t_ciphers.sh t_pubkey.sh
Added Files:
src/tests/crypto/libcrypto/evp: Makefile
src/tests/crypto/libcrypto/srp: Makefile
Log Message:
add tests for evb and srp
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/t_ciphers.sh \
src/tests/crypto/libcrypto/t_pubkey.sh
cvs rdiff -u -r0 -r1.1 src/tests/crypto/libcrypto/evp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/crypto/libcrypto/srp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.6 src/tests/crypto/libcrypto/Makefile:1.7
--- src/tests/crypto/libcrypto/Makefile:1.6 Tue Jul 13 21:13:21 2010
+++ src/tests/crypto/libcrypto/Makefile Thu Jun 9 05:25:21 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2010/07/13 21:13:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/09 05:25:21 spz Exp $
.include <bsd.own.mk>
.if ${MKCRYPTO} != "no"
-SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine hmac lhash \
- md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 threads x509v3
+SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac lhash \
+ md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 srp threads x509v3
.if ${MKCRYPTO_IDEA} != "no"
SUBDIR+=idea
Index: src/tests/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.2 src/tests/crypto/libcrypto/t_ciphers.sh:1.3
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.2 Mon Nov 8 19:06:12 2010
+++ src/tests/crypto/libcrypto/t_ciphers.sh Thu Jun 9 05:25:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.2 2010/11/08 19:06:12 pooka Exp $
+# $NetBSD: t_ciphers.sh,v 1.3 2011/06/09 05:25:21 spz Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -56,6 +56,16 @@
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_destest"
}
+atf_test_case evp
+evp_head()
+{
+ atf_set "descr" "Checks EVP cipher"
+}
+evp_body()
+{
+ atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $(atf_get_srcdir)/evptests.txt
+}
+
atf_test_case rc2
rc2_head()
{
@@ -107,6 +117,7 @@
atf_add_test_case bf
atf_add_test_case cast
atf_add_test_case des
+ atf_add_test_case evp
atf_add_test_case rc2
atf_add_test_case rc4
atf_add_test_case idea
Index: src/tests/crypto/libcrypto/t_pubkey.sh
diff -u src/tests/crypto/libcrypto/t_pubkey.sh:1.2 src/tests/crypto/libcrypto/t_pubkey.sh:1.3
--- src/tests/crypto/libcrypto/t_pubkey.sh:1.2 Mon Nov 8 19:06:12 2010
+++ src/tests/crypto/libcrypto/t_pubkey.sh Thu Jun 9 05:25:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_pubkey.sh,v 1.2 2010/11/08 19:06:12 pooka Exp $
+# $NetBSD: t_pubkey.sh,v 1.3 2011/06/09 05:25:21 spz Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -88,6 +88,16 @@
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ecdsatest"
}
+atf_test_case srp
+srp_head()
+{
+ atf_set "descr" "Checks SRP key agreement protocol"
+}
+srp_body()
+{
+ atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_srptest"
+}
+
atf_init_test_cases()
{
atf_add_test_case dsa
@@ -96,4 +106,5 @@
atf_add_test_case ec
atf_add_test_case ecdh
atf_add_test_case ecdsa
+ atf_add_test_case srp
}
Added files:
Index: src/tests/crypto/libcrypto/evp/Makefile
diff -u /dev/null src/tests/crypto/libcrypto/evp/Makefile:1.1
--- /dev/null Thu Jun 9 05:25:22 2011
+++ src/tests/crypto/libcrypto/evp/Makefile Thu Jun 9 05:25:17 2011
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2011/06/09 05:25:17 spz Exp $
+
+HELPER_NAME= evp_test
+HELPER_DIR= evp
+
+FILES= evptests.txt
+
+.include <bsd.init.mk>
Index: src/tests/crypto/libcrypto/srp/Makefile
diff -u /dev/null src/tests/crypto/libcrypto/srp/Makefile:1.1
--- /dev/null Thu Jun 9 05:25:22 2011
+++ src/tests/crypto/libcrypto/srp/Makefile Thu Jun 9 05:25:20 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2011/06/09 05:25:20 spz Exp $
+
+HELPER_NAME= srptest
+HELPER_DIR= srp
+
+.include <bsd.init.mk>
