From eef32868c6aa961f0ae29b5a113d0690dc4db25e Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 9 Jan 2009 12:15:52 +0000
Subject: resolve conflicts

---
 src/lib/libssl/test/tests.com | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(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 056082e7fe..88a33d0531 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -25,7 +25,7 @@ $	    tests := -
 	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_evp,test_ssl
+	test_ss,test_ca,test_engine,test_evp,test_ssl,test_ige,test_jpake
 $	endif
 $	tests = f$edit(tests,"COLLAPSE")
 $
@@ -57,6 +57,8 @@ $	SSLTEST :=	ssltest
 $	RSATEST :=	rsa_test
 $	ENGINETEST :=	enginetest
 $	EVPTEST :=	evp_test
+$	IGETEST :=	igetest
+$	JPAKETEST :=	jpaketest
 $
 $	tests_i = 0
 $ loop_tests:
@@ -250,6 +252,14 @@ $ test_rd:
 $	write sys$output "test Rijndael"
 $	!mcr 'texe_dir''rdtest'
 $	return
+$ test_ige: 
+$	write sys$output "Test IGE mode"
+$	mcr 'texe_dir''igetest'
+$	return
+$ test_jpake: 
+$	write sys$output "Test JPAKE"
+$	mcr 'texe_dir''jpaketest'
+$	return
 $
 $
 $ exit:
-- 
cgit v1.2.3-55-g6feb