resolve conflicts

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com
index 373dd16eac..a840d5078f 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -56,7 +56,7 @@ $	    tests := -
         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_tsa,test_ige,-
-        test_jpake,test_cms
+        test_jpake,test_srp,test_cms
 $       endif
 $       tests = f$edit(tests,"COLLAPSE")
 $
@@ -68,6 +68,8 @@ $	EXPTEST :=	exptest
 $       IDEATEST :=     ideatest
 $       SHATEST :=      shatest
 $       SHA1TEST :=     sha1test
+$       SHA256TEST :=   sha256t
+$       SHA512TEST :=   sha512t
 $       MDC2TEST :=     mdc2test
 $       RMDTEST :=      rmdtest
 $       MD2TEST :=      md2test
@@ -91,6 +93,7 @@ $	ENGINETEST :=	enginetest
 $       EVPTEST :=      evp_test
 $       IGETEST :=      igetest
 $       JPAKETEST :=    jpaketest
+$       SRPTEST :=      srptest
 $       ASN1TEST :=     asn1test
 $!
 $       tests_i = 0
@@ -114,6 +117,8 @@ $	return
 $ test_sha:
 $       mcr 'texe_dir''shatest'
 $       mcr 'texe_dir''sha1test'
+$       mcr 'texe_dir''sha256test'
+$       mcr 'texe_dir''sha512test'
 $       return
 $ test_mdc2:
 $       mcr 'texe_dir''mdc2test'
@@ -357,6 +362,10 @@ $	! Define the logical name used to find openssl.exe in the perl script.
 $       define /user_mode osslx 'exe_dir'
 $       perl CMS-TEST.PL
 $       return
+$ test_srp: 
+$       write sys$output "Test SRP"
+$       mcr 'texe_dir''srptest'
+$       return
 $
 $
 $ exit: