Excess kexp15

diff --git a/spec/cm/kem-gost3410-hkdf.texi b/spec/cm/kem-gost3410-hkdf.texi
index 6db200612412164abd87264800c838745b512e204bf757feaaf9059836f527ff..e9e3057f465f2b09b90c904220f8cd6788481b811655f91c54088e7a72990ae6 100644 (file)
--- a/spec/cm/kem-gost3410-hkdf.texi
+++ b/spec/cm/kem-gost3410-hkdf.texi
@@ -3,16 +3,15 @@
 @nodedescription GOST R 34.10+HKDF KEM
 @subsubsection GOST R 34.10+HKDF KEM
 
-@verbatiminclude ../tcl/schemas/kem-gost3410-hkdf-kexp15.tcl
+@verbatiminclude ../tcl/schemas/kem-gost3410-hkdf.tcl
 
 GOST R 34.10-2012 VKO parameter set A/C ("gost3410-256A", "gost3410-512C")
 must be used for DH operation, with UKM taken from the structure. VKO's
-output is 512- or 1024-bit @code{BE(X)||BE(Y)} point. It is used in HKDF
-and KExp15 (Р 1323565.1.017) key wrapping algorithm:
+output is 512- or 1024-bit @code{BE(X)||BE(Y)} point, used in HKDF below:
 
 @verbatim
 PRK = HKDF-Extract(Streebog-512, salt="", ikm=VKO(..., ukm=UKM))
-KEK= HKDF-Expand(Streebog-512, prk=PRK, info="cm/encrypted/gost3410-hkdf" || /id)
+KEK = HKDF-Expand(Streebog-512, prk=PRK, info="cm/encrypted/gost3410-hkdf" || /id)
 @end verbatim
 
 @code{/kem/*/cek} is wrapped with @ref{keywrap-kexp15} mechanism.

diff --git a/tcl/schemas/encrypted.tcl b/tcl/schemas/encrypted.tcl
index 7a9117122f0e1209153ca7ac86d8c2b05c91c7990b0140ff747b18a5073acd5a..d4833e5d08b68ef3b3ed50081bd65121120a689038c241e92021e8ec5f3379ba 100644 (file)
--- a/tcl/schemas/encrypted.tcl
+++ b/tcl/schemas/encrypted.tcl
@@ -18,6 +18,6 @@ kem {
 
 schema-include fpr.tcl
 schema-include kem-with-encap.tcl
-schema-include kem-gost3410-hkdf-kexp15.tcl
+schema-include kem-gost3410-hkdf.tcl
 schema-include kem-balloon-blake2b-hkdf.tcl
 schema-include kem-pbkdf2.tcl

diff --git a/tcl/schemas/kem-gost3410-hkdf-kexp15.tcl b/tcl/schemas/kem-gost3410-hkdf.tcl
similarity index 76%
rename from tcl/schemas/kem-gost3410-hkdf-kexp15.tcl
rename to tcl/schemas/kem-gost3410-hkdf.tcl
index 08268b2831c5a08e22a6d1aa84907e1071c5709bdf1264f2c5786a36d9a7c938..8cce4ece5af7cbed73f9cebd1cef2b76bd31bdff6790ab86365ce54ba24f69fc 100644 (file)
--- a/tcl/schemas/kem-gost3410-hkdf-kexp15.tcl
+++ b/tcl/schemas/kem-gost3410-hkdf.tcl
@@ -1,5 +1,5 @@
-kem-gost3410-hkdf-kexp15 {
-    {field a {str} =gost3410-hkdf-kexp15}
+kem-gost3410-hkdf {
+    {field a {str} =gost3410-hkdf}
     {field cek {bin} >0} {# wrapped CEK}
     {field ukm {bin} len=16} {# additional keying material}
     {field pub {bin} >0} {# sender's ephemeral public key}