X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fssl.try;h=d14a203fddb0222aa79dd8975ab97fcbccb756a5;hb=986905842330e4a54e61334eb508fe3147c43e38;hp=54672bc6b439eb8c36346712c98572f47256727b;hpb=3b8ddfe2f303b8931842e52bdb5c07c97042f651;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/ssl.try b/tcl_tests/ssl.try
index 54672bc..d14a203 100644
--- a/tcl_tests/ssl.try
+++ b/tcl_tests/ssl.try
@@ -1,5 +1,5 @@
 #!/usr/bin/tclsh
-# -*- coding: cp1251 -*-
+
 lappend auto_path [file dirname [info script]]
 package require ossltest
 if {$argc==2} {
@@ -42,10 +42,10 @@ if {[info exists env(ALG_LIST)]} {
 }
 
 array set suites {
-rsa:1024 {ECDHE-RSA-AES256-SHA}
-gost2001:XA {GOST2001-GOST89-GOST89 GOST2001-NULL-GOST94@SECLEVEL=0 GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0}
-gost2012_256:XA {GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0 GOST2012-MAGMA-MAGMAOMAC GOST2012-KUZNYECHIK-KUZNYECHIKOMAC}
-gost2012_512:A {GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0 GOST2012-MAGMA-MAGMAOMAC GOST2012-KUZNYECHIK-KUZNYECHIKOMAC}
+rsa:1024 {ECDHE-RSA-AES256-SHA@SECLEVEL=0}
+gost2001:XA {GOST2001-GOST89-GOST89 GOST2001-NULL-GOST94@SECLEVEL=0 LEGACY-GOST2012-GOST8912-GOST8912 IANA-GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0}
+gost2012_256:XA {LEGACY-GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0}
+gost2012_512:A {LEGACY-GOST2012-GOST8912-GOST8912 GOST2012-NULL-GOST12@SECLEVEL=0}
 }
 
 #
@@ -63,14 +63,14 @@ array set defsuite {
 rsa:1024 ECDHE-RSA-AES256-SHA
 #gost94:XA GOST94-GOST89-GOST89
 gost2001:XA GOST2012-GOST8912-GOST8912
-gost2012_256:XA GOST2012-GOST8912-GOST8912
-gost2012_512:A GOST2012-GOST8912-GOST8912
+gost2012_256:XA LEGACY-GOST2012-GOST8912-GOST8912
+gost2012_512:A LEGACY-GOST2012-GOST8912-GOST8912
 }
 
 array set defsuite_12 {
 rsa:1024 ECDHE-RSA-AES256-GCM-SHA384
 #gost94:XA GOST94-GOST89-GOST89
-gost2001:XA GOST2012-GOST8912-GOST8912
+gost2001:XA LEGACY-GOST2012-GOST8912-GOST8912
 gost2012_256:XA GOST2012-MAGMA-MAGMAOMAC
 gost2012_512:A GOST2012-MAGMA-MAGMAOMAC
 }
@@ -202,7 +202,7 @@ foreach proto $proto_list {
 						-CAfile $::test::ca/cacert.pem -verify_return_error \
 						-verify 1 -state -cipher $suite] \
 						[list -www -cert localhost_$alg_fn/cert.pem \
-						-key localhost_$alg_fn/seckey.pem $protos($proto)] {}] 
+						-key localhost_$alg_fn/seckey.pem $protos($proto) -cipher ALL@SECLEVEL=0] {}] 
 					if {[regexp -lineanchor \
 					{^\s*Protocol\s*:\s*(\S*)\s*$.*^\s*Cipher\s*:\s*(\S*)\s*$} \
 					[lindex $list 0] -> result_proto result_cipher]} {
@@ -210,7 +210,7 @@ foreach proto $proto_list {
 					} else {
 						lindex $list 1
 					}	
-				} 0 [list 0 $proto $suite]
+				} 0 [list 0 $proto $raw_name]
 
 
 				test "Сервер c несколькими алгоритмами, клиент $suite $proto" {
@@ -220,7 +220,7 @@ foreach proto $proto_list {
 						[list -www -cert localhost_rsa/cert.pem \
 						-key localhost_rsa/seckey.pem \
 						-dcert localhost_$alg_fn/cert.pem \
-						-dkey localhost_$alg_fn/seckey.pem $protos($proto)] {}] 
+						-dkey localhost_$alg_fn/seckey.pem $protos($proto) -cipher ALL@SECLEVEL=0] {}] 
 					if {[regexp -lineanchor \
 					{^\s*Protocol\s*:\s*(\S*)\s*$.*^\s*Cipher\s*:\s*(\S*)\s*$} \
 					[lindex $list 0] -> result_proto result_cipher]} {
@@ -228,18 +228,18 @@ foreach proto $proto_list {
 					} else {
 						lindex $list 1
 					}	
-				} 0 [list 0 $proto $suite]
+				} 0 [list 0 $proto $raw_name]
 
 			}
 
 			test "Сервер c несколькими алгоритмами, клиент AES256-SHA $proto" {
 				set list [client_server [list -connect localhost:4433 \
 					-CAfile $::test::ca/cacert.pem -verify_return_error \
-					-verify 1 -state -cipher AES256-SHA] \
+					-verify 1 -state -cipher AES256-SHA@SECLEVEL=0] \
 					[list -www -cert localhost_rsa/cert.pem \
 					-key localhost_rsa/seckey.pem \
 					-dcert localhost_$alg_fn/cert.pem \
-					-dkey localhost_$alg_fn/seckey.pem $protos($proto)] {}] 
+					-dkey localhost_$alg_fn/seckey.pem $protos($proto) -cipher ALL@SECLEVEL=0] {}] 
 				if {[regexp -lineanchor \
 				{^\s*Protocol\s*:\s*(\S*)\s*$.*^\s*Cipher\s*:\s*(\S*)\s*$} \
 				[lindex $list 0] -> result_proto result_cipher]} {
@@ -288,7 +288,7 @@ foreach proto $proto_list {
 		} else {
 			set expected_proto "TLSv1.0"
 		}
-
+if {0} {
 		test "Умолчательный хендшейк с ключами $alg $proto" {
 			set list [client_server [list -connect localhost:4433\
 				-CAfile $::test::ca/cacert.pem -verify_return_error -verify 1\
@@ -315,7 +315,7 @@ foreach proto $proto_list {
 				"GET /\n"]
 			list [lindex $list 2] [grep "^New," [lindex $list 0]]
 		} 0 [list 0 [string repeat "New, $expected_proto, Cipher is $etalon\n" 2]]
-
+}; # if {0}
 	}
 }