X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fcmsenc.try;h=f9e66666cca3f79ade78809443f99a37e9f8abc1;hb=c5ec3860a0c95a74ee98210e0ac174924866dab1;hp=66082265dbfce5f546488e71cd7d518e6acb6999;hpb=3b8ddfe2f303b8931842e52bdb5c07c97042f651;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/cmsenc.try b/tcl_tests/cmsenc.try
index 6608226..f9e6666 100644
--- a/tcl_tests/cmsenc.try
+++ b/tcl_tests/cmsenc.try
@@ -1,11 +1,10 @@
 #!/usr/bin/tclsh
-# -*- coding: cp1251 -*-
 lappend auto_path [file dirname [info script]]
 package require ossltest
 cd $::test::dir
 set testname [file rootname [file tail $::argv0]]
 
-start_tests "Тесты на cms -encrypt" 
+start_tests "Тесты на cms -encrypt"
 proc make_fn {alg} {
 	return [string map {":" "_"} $alg]
 }
@@ -17,9 +16,9 @@ proc map {str list} {
 	}
 	return $result
 }
-	
+
 if {![file exist encrypt.dat]} {
-	makeFile encrypt.dat [string repeat "Test data to encrypt.\n" 100] 
+	makeFile encrypt.dat [string repeat "Test data to encrypt.\n" 100]
 }
 
 if {![info exist env(NO_RSA)]} {
@@ -35,7 +34,7 @@ test "Make registered user $user" {
 
 
 test -createsfiles cms_enc_rsa.msg "RSA User 1 encrypts message for RSA user 2" {
-	openssl "cms -encrypt -in encrypt.dat -des -out cms_enc_rsa.msg U_cms_enc_rsa_2/cert.pem"
+	openssl "cms -encrypt -in encrypt.dat -aes-128-cbc -out cms_enc_rsa.msg U_cms_enc_rsa_2/cert.pem"
 	file isfile cms_enc_rsa.msg
 } 0 1
 
@@ -96,7 +95,7 @@ test "Creating user $username with key $alg" {
 
 	if {![file exists $username/req.pem]&&[file exists $username/cert.pem]} {
 		file delete $username/cert.pem
-	}	
+	}
 	file exists $username/cert.pem
 } 0 1
 
@@ -123,7 +122,7 @@ test -skip {![file exists cms_enc_$alg_fn.pem]} "Checking oids in pkcs7 structur
 
 test -createsfiles cms_decrypt.$alg_fn "Decrypting file encrypted for $username" {
 	set expected [getFile encrypt.dat]
-	openssl "cms -decrypt -in cms_enc_$alg_fn.msg -recip U_cms_enc_$alg_fn/cert.pem -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt.$alg_fn"
+	openssl "cms -decrypt -debug_decrypt -in cms_enc_$alg_fn.msg -recip U_cms_enc_$alg_fn/cert.pem -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt.$alg_fn"
 	set result [getFile cms_decrypt.$alg_fn]
 	string eq $expected $result
 } 0 1
@@ -142,14 +141,14 @@ if {[info exists env(CRYPT_PARAMS)]} {unset env(CRYPT_PARAMS)}
 
 test -createsfiles cms_decrypt_t.$alg_fn "Decrypting file text-encrypted for $username" {
 	set expected [getFile encrypt.dat]
-	openssl "cms -decrypt -text -in cms_enc_t_$alg_fn.msg -recip U_cms_enc_$alg_fn/cert.pem -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt_t.$alg_fn"
+	openssl "cms -decrypt -debug_decrypt -text -in cms_enc_t_$alg_fn.msg -recip U_cms_enc_$alg_fn/cert.pem -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt_t.$alg_fn"
 	set result [getFile cms_decrypt_t.$alg_fn]
 	string eq $expected $result
 } 0 1
 
 test -createsfiles cms_decrypt_t_nocert.$alg_fn "Decrypting file text-encrypted for $username without cert" {
 	set expected [getFile encrypt.dat]
-	openssl "cms -decrypt -text -in cms_enc_t_$alg_fn.msg -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt_t_nocert.$alg_fn"
+	openssl "cms -decrypt -debug_decrypt -text -in cms_enc_t_$alg_fn.msg -inkey U_cms_enc_$alg_fn/seckey.pem -out cms_decrypt_t_nocert.$alg_fn"
 	set result [getFile cms_decrypt_t_nocert.$alg_fn]
 	string eq $expected $result
 } 0 1
@@ -168,7 +167,7 @@ foreach enc_tuple $enc_list {
 	}
 	set alg_fn [make_fn $enc_tuple]
 	set username U_cms_enc_$alg_fn
-	
+
 test -skip {![file exists cms_enc_4all.msg]} -createsfiles cms_decrypt_4all.$alg_fn "Decrypting gost-encrypted file, recipient $alg_fn" {
 	set expected [getFile encrypt.dat]
 	openssl "cms -decrypt -in cms_enc_4all.msg -recip $username/cert.pem -inkey $username/seckey.pem -out cms_decrypt_4all.$alg_fn"
@@ -178,7 +177,7 @@ test -skip {![file exists cms_enc_4all.msg]} -createsfiles cms_decrypt_4all.$alg
 
 test -skip {![file exists cms_enc_4all.msg]} -createsfiles cms_decrypt_4all_nocert.$alg_fn "Decrypting gost-encrypted file without cert, recipient $alg_fn" {
 	set expected [getFile encrypt.dat]
-	openssl "cms -decrypt -in cms_enc_4all.msg -inkey $username/seckey.pem -out cms_decrypt_4all_nocert.$alg_fn"
+	openssl "cms -decrypt -debug_decrypt -in cms_enc_4all.msg -inkey $username/seckey.pem -out cms_decrypt_4all_nocert.$alg_fn"
 	set result [getFile cms_decrypt_4all_nocert.$alg_fn]
 	string eq $expected $result
 } 0 1