From 38ce604e3cc97706b876b0525ddff0121115456d Mon Sep 17 00:00:00 2001 From: djm <> Date: Sat, 6 Sep 2008 12:17:54 +0000 Subject: resolve conflicts --- src/lib/libssl/test/tests.com | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/test/tests.com') diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com index 07a3c7f16d..056082e7fe 100644 --- a/src/lib/libssl/test/tests.com +++ b/src/lib/libssl/test/tests.com @@ -22,14 +22,17 @@ $ tests := - test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,- test_md2,test_mdc2,- test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,- - test_rand,test_bn,test_ec,test_enc,test_x509,test_rsa,test_crl,test_sid,- + test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- + test_enc,test_x509,test_rsa,test_crl,test_sid,- test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- - test_ss,test_ca,test_engine,test_ssl,test_evp + test_ss,test_ca,test_engine,test_evp,test_ssl $ endif $ tests = f$edit(tests,"COLLAPSE") $ $ BNTEST := bntest $ ECTEST := ectest +$ ECDSATEST := ecdsatest +$ ECDHTEST := ecdhtest $ EXPTEST := exptest $ IDEATEST := ideatest $ SHATEST := shatest @@ -182,6 +185,14 @@ $ test_ec: $ write sys$output "test elliptic curves" $ mcr 'texe_dir''ectest' $ return +$ test_ecdsa: +$ write sys$output "test ecdsa" +$ mcr 'texe_dir''ecdsatest' +$ return +$ test_ecdh: +$ write sys$output "test ecdh" +$ mcr 'texe_dir''ecdhtest' +$ return $ test_verify: $ write sys$output "The following command should have some OK's and some failures" $ write sys$output "There are definitly a few expired certificates" -- cgit v1.2.3-55-g6feb