X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fsmime_io.try;h=e0c7235c745f33a94fbc904ada4d93f5f9a62b2d;hb=ede3886cc5507c2ba000ab9b057f198da03e8766;hp=ec4df2dcbb446d72b1ba405a0e5b28daea748df4;hpb=3b8ddfe2f303b8931842e52bdb5c07c97042f651;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/smime_io.try b/tcl_tests/smime_io.try
index ec4df2d..e0c7235 100644
--- a/tcl_tests/smime_io.try
+++ b/tcl_tests/smime_io.try
@@ -1,5 +1,4 @@
 #!/usr/bin/tclsh
-# -*- coding: cp1251 -*-
 lappend auto_path [file dirname [info script]]
 package require ossltest
 cd $::test::dir
@@ -30,12 +29,12 @@ foreach alg $alg_list {
 
 test -skip {![file exists sign_$alg_fn.msg]} "Verifying a message signed with $alg without ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_$alg_fn.msg -out verified.txt -noverify -certfile $username/cert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists sign_$alg_fn.msg]}  "Verifying a message signed with $alg with ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_$alg_fn.msg -out verified.txt -certfile $username/cert.pem -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists bad_$alg_fn.msg]} -createsfiles verified.txt "Verifying corrupted messages signed with $alg via smime" {
@@ -44,22 +43,22 @@ test -skip {![file exists bad_$alg_fn.msg]} -createsfiles verified.txt "Verifyin
 
 test -skip {![file exists sign_c_$alg_fn.msg]} "Verifying a message signed with $alg having cert inside without ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_c_$alg_fn.msg -out verified.txt -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists sign_c_$alg_fn.msg]} "Verifying a message signed with $alg having cert with ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_c_$alg_fn.msg -out verified.txt -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -createsfiles verified.txt -skip {![file exists sign_op_$alg_fn.msg]} "Verifying a message signed by $alg having cert inside without ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_op_$alg_fn.msg -out verified.txt -noverify"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -createsfiles verified.txt -skip {![file exists sign_op_$alg_fn.msg]} "Verifying a $alg opaque  message with ca via cms" {
 	grep Veri [openssl "cms -verify -text -in sign_op_$alg_fn.msg -out verified.txt -CAfile $::test::ca/cacert.pem"]
-} 0 "Verification successful
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists broken_op_$alg_fn.msg]} "Verifying broken $alg opaque message" {
@@ -67,8 +66,8 @@ test -skip {![file exists broken_op_$alg_fn.msg]} "Verifying broken $alg opaque
 } 1 "Verification failure"
 
 test -skip {![file exists sign_det_$alg_fn.pem]} "Verifying detached $alg signature via cms" {
-	grep Veri [openssl "cms -verify -content sign.dat -inform PEM -in sign_det_$alg_fn.pem -out verified.txt -noverify"]
-} 0 "Verification successful
+	grep Veri [openssl "cms -verify -binary -content sign.dat -inform PEM -in sign_det_$alg_fn.pem -out verified.txt -noverify"]
+} 0 "CMS Verification successful
 "
 
 test -skip {![file exists sign_det_$alg_fn.msg]} -createsfiles {bad.dat} "Verifying corrupted $alg detached signature" {