X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Freq-newkey.try;h=7664a36a166867285d281da6dd9412f30830f497;hb=d183173c9843e827fb273fd272b4ab022d538c03;hp=fe05fa698c0958eb4a31b14f8799492325a10fe1;hpb=3b8ddfe2f303b8931842e52bdb5c07c97042f651;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/req-newkey.try b/tcl_tests/req-newkey.try
index fe05fa6..7664a36 100644
--- a/tcl_tests/req-newkey.try
+++ b/tcl_tests/req-newkey.try
@@ -1,5 +1,4 @@
 #!/usr/bin/tclsh
-# -*- coding: cp1251 -*-
 if {[info exists env(PKG_PATH)]} {
 	lappend auto_path $env(PKG_PATH)
 } else {	
@@ -40,6 +39,11 @@ gost2012_256:A "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ A" 0 1.2.643.2.2.35.
 gost2012_256:B "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ B" 0 1.2.643.2.2.35.2
 gost2012_256:C "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ C" 0 1.2.643.2.2.35.3
 gost2012_256:D "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ" 1 invalid_paramset
+gost2012_256:TCA "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ Ð¢Ð26 A" 0 1.2.643.7.1.2.1.1.1
+gost2012_256:TCB "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ Ð¢Ð26 B" 0 1.2.643.7.1.2.1.1.2
+gost2012_256:TCC "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ Ð¢Ð26 C" 0 1.2.643.7.1.2.1.1.3
+gost2012_256:TCD "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ Ð¢Ð26 D" 0 1.2.643.7.1.2.1.1.4
+gost2012_256:TCE "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ Ð¢Ð26 Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ" 1 invalid_paramset
 gost2012_256:id-GostR3410-2001-CryptoPro-B-ParamSet  "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ B Ð¿Ð¾ Ð¸Ð¼ÐµÐ½Ð¸" 0 1.2.643.2.2.35.2
 gost2012_256:1.2.643.2.2.35.1 "ÐÐÐ¡Ð¢ 2012 256 Ð±Ð¸Ñ ÐÑÐ¸Ð¿ÑÐ¾Ð¿ÑÐ¾ A Ð¿Ð¾ OID" 0 1.2.643.2.2.35.1
 gost2012_256:1.2.840.113549.1.1.1 "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ OID" 1 invalid_paramset
@@ -47,7 +51,8 @@ gost2012_256:RSAencryption: "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð¸Ð¼Ñ Ð¾Ð±ÑÐµÐºÑÐ°" 1 i
 gost2012_512: "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ" 1 no_param_set
 gost2012_512:A "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð¢Ð26 A" 0 1.2.643.7.1.2.1.2.1
 gost2012_512:B "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð¢Ð26 B" 0 1.2.643.7.1.2.1.2.2
-gost2012_512:C "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ" 1 invalid_paramset
+gost2012_512:C "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð¢Ð26 C" 0 1.2.643.7.1.2.1.2.3
+gost2012_512:D "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ" 1 invalid_paramset
 gost2012_512:id-tc26-gost-3410-2012-512-paramSetB  "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² B Ð¿Ð¾ Ð¸Ð¼ÐµÐ½Ð¸" 0 1.2.643.7.1.2.1.2.2
 gost2012_512:1.2.643.7.1.2.1.2.1 "ÐÐÐ¡Ð¢ 2012 512 Ð±Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² A Ð¿Ð¾ OID" 0 1.2.643.7.1.2.1.2.1
 gost2012_512:1.2.643.2.2.35.1 "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ OID" 1 invalid_paramset