Set Enveloped data version to 2 if ktri version not zero.

[openssl.git] / test / testgen.com

diff --git a/test/testgen.com b/test/testgen.com
index c7a78f7637c7a1acc9521752c5567326eb68d9e7..e076da2f306b14319150433ed5f186d81cedd0b4 100644 (file)
--- a/test/testgen.com
+++ b/test/testgen.com
@@ -1,31 +1,56 @@
-$! TETSGEN.COM
+$! TESTGEN.COM
 $
-$      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
-$      exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$      __arch = "VAX"
+$      if f$getsyi("cpu") .ge. 128 then -
+          __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$      if __arch .eqs. "" then __arch = "UNK"
+$      if (p1 .eqs. 64) then __arch = __arch+ "_64"
+$      exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$      T := testcert
+$      T = "testcert"
 $      KEY = 512
-$      CA := [-.certs]testca.pem
+$      CA = "[-.certs]testca.pem"
 $
 $      set noon
-$      delete 'T'.1;*,'T'.2;*,'T'.key;*
+$      if f$search(T+".1;*") .nes. "" then delete 'T'.1;*
+$      if f$search(T+".2;*") .nes. "" then delete 'T'.2;*
+$      if f$search(T+".key;*") .nes. "" then delete 'T'.key;*
 $      set on
 $
 $      write sys$output "generating certificate request"
 $
-$      write sys$output "There should be a 2 sequences of .'s and some +'s."
-$      write sys$output "There should not be more that at most 80 per line"
+$      append/new nl: .rnd
+$      open/append random_file .rnd
+$      write random_file -
+        "string to make the random number generator think it has entropy"
+$      close random_file
+$
+$      set noon
+$      define/user sys$output nla0:
+$      mcr 'exe_dir'openssl no-rsa
+$      save_severity=$SEVERITY
+$      set on
+$      if save_severity
+$      then
+$          req_new="-newkey dsa:[-.apps]dsa512.pem"
+$      else
+$          req_new="-new"
+$          write sys$output -
+            "There should be a 2 sequences of .'s and some +'s."
+$          write sys$output -
+            "There should not be more that at most 80 per line"
+$      endif
+$
 $      write sys$output "This could take some time."
 $
-$      mcr 'exe_dir'openssl req -config test.cnf -new -out testreq.pem
+$      mcr 'exe_dir'openssl req -config test.cnf 'req_new' -out testreq.pem
 $      if $severity .ne. 1
 $      then
 $          write sys$output "problems creating request"
 $          exit 3
 $      endif
 $
-$      mcr 'exe_dir'openssl req -verify -in testreq.pem -noout
+$      mcr 'exe_dir'openssl req -config test.cnf -verify -in testreq.pem -noout
 $      if $severity .ne. 1
 $      then
 $          write sys$output "signature on req is wrong"