Update test to match current openssl messages

diff --git a/tcl_tests/cms.try b/tcl_tests/cms.try
index a877c0b9091a87227e66e1444bb9a3744067ca87..1cc6d0218fa52925b01a9e944866dd4942178567 100644 (file)
--- a/tcl_tests/cms.try
+++ b/tcl_tests/cms.try
@@ -68,12 +68,12 @@ test -skip {![file exists cms_sign_$alg_fn.pem]} "Checking oids in cms struct" {
 
 test -skip {![file exists cms_sign_$alg_fn.msg]} "Verifying a message signed with $alg without ca " {
        grep Veri [openssl "cms -verify -text -in cms_sign_$alg_fn.msg -out cms_verified.txt -noverify -certfile $username/cert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists cms_sign_$alg_fn.msg]}  "Verifying a message signed with $alg with ca" {
        grep Veri [openssl "cms -verify -text -in cms_sign_$alg_fn.msg -out cms_verified.txt -certfile $username/cert.pem -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists cms_sign_$alg_fn.msg]} -createsfiles [list cms_bad_$alg_fn.msg cms_verified.txt] "Verifying corrupted messages signed with $alg" {
@@ -95,12 +95,12 @@ test -skip {![file exist cms_sign_c_$alg_fn.msg]} "Checking micalg param in sign
 
 test -skip {![file exists cms_sign_c_$alg_fn.msg]} "Verifying a message signed with $alg having cert inside without ca" {
        grep Veri [openssl "cms -verify -text -in cms_sign_c_$alg_fn.msg -out cms_verified.txt -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists cms_sign_c_$alg_fn.msg]} "Verifying a message signed with $alg having cert with ca" {
        grep Veri [openssl "cms -verify -text -in cms_sign_c_$alg_fn.msg -out cms_verified.txt -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists $username/cert.pem]} -createsfiles {cms_sign.dat cms_sign_op_$alg_fn.msg} "Signing a message by $alg with cert using opaque signing" {
@@ -111,12 +111,12 @@ test -skip {![file exists $username/cert.pem]} -createsfiles {cms_sign.dat cms_s
 
 test -createsfiles cms_verified.txt -skip {![file exists cms_sign_op_$alg_fn.msg]} "Verifying a message signed by $alg having cert inside without ca" {
        grep Veri [openssl "cms -verify -text -in cms_sign_op_$alg_fn.msg -out cms_verified.txt -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -createsfiles cms_verified.txt -skip {![file exists cms_sign_op_$alg_fn.msg]} "Verifying a $alg opaque  message with ca" {
        grep Veri [openssl "cms -verify -text -in cms_sign_op_$alg_fn.msg -out cms_verified.txt -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -createsfiles cms_broken_op_$alg_fn.msg  -skip {![file exists cms_sign_op_$alg_fn.msg]} "Verifying broken $alg opaque message" {
@@ -159,7 +159,7 @@ test -skip {![file exists cms_sign_$alg_fn.pem]} "Checking oids in cms struct" {
 
 test -skip {![file exists cms_sign_det_$alg_fn.pem]} "Verifying detached $alg cms_signature" {
        grep Veri [openssl "cms -verify -binary -content cms_sign.dat -inform PEM -in cms_sign_det_$alg_fn.pem -out cms_verified.txt -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists cms_sign_det_$alg_fn.msg]} -createsfiles {bad.dat} "Verifying corrupted $alg detached cms_signature" {

diff --git a/tcl_tests/cms2.try b/tcl_tests/cms2.try
index 884f1eca6db0c6a4f23dd5612cd4c3f0f1aa10bf..c734a6c27db367d7b59d0ce6e5088fa305a22215 100644 (file)
--- a/tcl_tests/cms2.try
+++ b/tcl_tests/cms2.try
@@ -30,7 +30,7 @@ test -createsfiles cms_signed2_2_$length.asn "Signing in DER format with 2nd sig
 
 test -createsfiles {was_signed.dat signer.certs} "Verifying signature in DER format" {
        grep "Verif" [openssl "cms -verify -inform der -in cms_signed2_2_$length.asn -noverify -signer signer.certs -out was_signed.dat"]
-} 0 {Verification successful
+} 0 {CMS Verification successful
 }
 
 test "Signed data is extracted correctly" {
@@ -64,7 +64,7 @@ test -createsfiles cms_signed2_2_$length\_op.msg "Signing opaque in S/MIME forma
 
 test -createsfiles {was_signed.dat signer.certs} "Verifying opaque signature in S/MIME format" {
        grep "Verif" [openssl "cms -verify -in cms_signed2_2_$length\_op.msg -noverify -signer signer.certs -out was_signed.dat"]
-} 0 {Verification successful
+} 0 {CMS Verification successful
 }
 
 test "Signed data is extracted correctly" {
@@ -98,7 +98,7 @@ test -createsfiles cms_signed2_2_$length\_det.asn "Signing detached in DER forma
 
 test -createsfiles {was_signed.dat signer.certs} "Verifying detached signature in DER format" {
        grep "Verif" [openssl "cms -verify -in cms_signed2_2_$length\_det.asn -noverify -signer signer.certs -out was_signed.dat -content signed2.dat -inform der"]
-} 0 {Verification successful
+} 0 {CMS Verification successful
 }
 
 test "Signed data is extracted correctly" {
@@ -131,7 +131,7 @@ test -createsfiles cms_signed2_2_$length.msg "Signing in S/MIME format with 2nd
 
 test -createsfiles {was_signed.dat  signer.certs} "Verifying signature in S/MIME format" {
        grep "Verif" [openssl "cms -verify -in cms_signed2_2_$length.msg -noverify -signer signer.certs -out was_signed.dat -inform smime"]
-} 0 {Verification successful
+} 0 {CMS Verification successful
 }
 
 test "Signed data is extracted correctly" {

diff --git a/tcl_tests/cmstc262019.try b/tcl_tests/cmstc262019.try
index c2bdb8552c28714511279d22990eca19e061c53f..7e1402644cc1c99e1e2b439cabfefb13ded953d2 100644 (file)
--- a/tcl_tests/cmstc262019.try
+++ b/tcl_tests/cmstc262019.try
@@ -14,12 +14,12 @@ start_tests "CMS tests, TC26 examples"
 
 test "Signed data, 512 bits, signed attributes" {
        grep "Verification successful" [openssl "cms -verify -in tc26_cms/signed_a111.pem -inform PEM -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test "Signed data, 256 bits, no signed attributes" {
        grep "Verification successful" [openssl "cms -verify -in tc26_cms/signed_a121.pem -inform PEM -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test "Digested data, 256 bits" {