X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgogost%2Fgost28147%2Fecb_test.go;h=76928c9986abc51e438a73e3b75db561b0e5d2df;hb=69e668f3499122e0b1140f3bd927de41ad279b94;hp=b293a222714a965c71f1fba03487c58e6d616b57;hpb=9be6f384bae8ebeabc129ede9f8a597de12835d3;p=gogost.git

diff --git a/src/cypherpunks.ru/gogost/gost28147/ecb_test.go b/src/cypherpunks.ru/gogost/gost28147/ecb_test.go
index b293a22..76928c9 100644
--- a/src/cypherpunks.ru/gogost/gost28147/ecb_test.go
+++ b/src/cypherpunks.ru/gogost/gost28147/ecb_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 func TestECBGCL3Vectors(t *testing.T) {
-	key := [KeySize]byte{
+	key := []byte{
 		0x04, 0x75, 0xf6, 0xe0, 0x50, 0x38, 0xfb, 0xfa,
 		0xd2, 0xc7, 0xc3, 0x90, 0xed, 0xb3, 0xca, 0x3d,
 		0x15, 0x47, 0x12, 0x42, 0x91, 0xae, 0x1e, 0x8a,
@@ -114,135 +114,129 @@ func TestECBGCL3Vectors(t *testing.T) {
 // Crypto++ 5.6.2 test vectors
 func TestECBCryptoPPVectors(t *testing.T) {
 	sbox := &SboxAppliedCryptographyParamSet
-	var key [KeySize]byte
-	var pt [BlockSize]byte
-	var ct [BlockSize]byte
 	tmp := make([]byte, BlockSize)
-	var c *Cipher
-
-	key = [KeySize]byte{
+	key := []byte{
 		0xBE, 0x5E, 0xC2, 0x00, 0x6C, 0xFF, 0x9D, 0xCF,
 		0x52, 0x35, 0x49, 0x59, 0xF1, 0xFF, 0x0C, 0xBF,
 		0xE9, 0x50, 0x61, 0xB5, 0xA6, 0x48, 0xC1, 0x03,
 		0x87, 0x06, 0x9C, 0x25, 0x99, 0x7C, 0x06, 0x72,
 	}
-	pt = [BlockSize]byte{0x0D, 0xF8, 0x28, 0x02, 0xB7, 0x41, 0xA2, 0x92}
-	ct = [BlockSize]byte{0x07, 0xF9, 0x02, 0x7D, 0xF7, 0xF7, 0xDF, 0x89}
-	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	pt := []byte{0x0D, 0xF8, 0x28, 0x02, 0xB7, 0x41, 0xA2, 0x92}
+	ct := []byte{0x07, 0xF9, 0x02, 0x7D, 0xF7, 0xF7, 0xDF, 0x89}
+	c := NewCipher(key, sbox)
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0xB3, 0x85, 0x27, 0x2A, 0xC8, 0xD7, 0x2A, 0x5A,
 		0x8B, 0x34, 0x4B, 0xC8, 0x03, 0x63, 0xAC, 0x4D,
 		0x09, 0xBF, 0x58, 0xF4, 0x1F, 0x54, 0x06, 0x24,
 		0xCB, 0xCB, 0x8F, 0xDC, 0xF5, 0x53, 0x07, 0xD7,
 	}
-	pt = [BlockSize]byte{0x13, 0x54, 0xEE, 0x9C, 0x0A, 0x11, 0xCD, 0x4C}
-	ct = [BlockSize]byte{0x4F, 0xB5, 0x05, 0x36, 0xF9, 0x60, 0xA7, 0xB1}
+	pt = []byte{0x13, 0x54, 0xEE, 0x9C, 0x0A, 0x11, 0xCD, 0x4C}
+	ct = []byte{0x4F, 0xB5, 0x05, 0x36, 0xF9, 0x60, 0xA7, 0xB1}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0xAE, 0xE0, 0x2F, 0x60, 0x9A, 0x35, 0x66, 0x0E,
 		0x40, 0x97, 0xE5, 0x46, 0xFD, 0x30, 0x26, 0xB0,
 		0x32, 0xCD, 0x10, 0x7C, 0x7D, 0x45, 0x99, 0x77,
 		0xAD, 0xF4, 0x89, 0xBE, 0xF2, 0x65, 0x22, 0x62,
 	}
-	pt = [BlockSize]byte{0x66, 0x93, 0xD4, 0x92, 0xC4, 0xB0, 0xCC, 0x39}
-	ct = [BlockSize]byte{0x67, 0x00, 0x34, 0xAC, 0x0F, 0xA8, 0x11, 0xB5}
+	pt = []byte{0x66, 0x93, 0xD4, 0x92, 0xC4, 0xB0, 0xCC, 0x39}
+	ct = []byte{0x67, 0x00, 0x34, 0xAC, 0x0F, 0xA8, 0x11, 0xB5}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0x32, 0x0E, 0x9D, 0x84, 0x22, 0x16, 0x5D, 0x58,
 		0x91, 0x1D, 0xFC, 0x7D, 0x8B, 0xBB, 0x1F, 0x81,
 		0xB0, 0xEC, 0xD9, 0x24, 0x02, 0x3B, 0xF9, 0x4D,
 		0x9D, 0xF7, 0xDC, 0xF7, 0x80, 0x12, 0x40, 0xE0,
 	}
-	pt = [BlockSize]byte{0x99, 0xE2, 0xD1, 0x30, 0x80, 0x92, 0x8D, 0x79}
-	ct = [BlockSize]byte{0x81, 0x18, 0xFF, 0x9D, 0x3B, 0x3C, 0xFE, 0x7D}
+	pt = []byte{0x99, 0xE2, 0xD1, 0x30, 0x80, 0x92, 0x8D, 0x79}
+	ct = []byte{0x81, 0x18, 0xFF, 0x9D, 0x3B, 0x3C, 0xFE, 0x7D}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0xC9, 0xF7, 0x03, 0xBB, 0xBF, 0xC6, 0x36, 0x91,
 		0xBF, 0xA3, 0xB7, 0xB8, 0x7E, 0xA8, 0xFD, 0x5E,
 		0x8E, 0x8E, 0xF3, 0x84, 0xEF, 0x73, 0x3F, 0x1A,
 		0x61, 0xAE, 0xF6, 0x8C, 0x8F, 0xFA, 0x26, 0x5F,
 	}
-	pt = [BlockSize]byte{0xD1, 0xE7, 0x87, 0x74, 0x9C, 0x72, 0x81, 0x4C}
-	ct = [BlockSize]byte{0xA0, 0x83, 0x82, 0x6A, 0x79, 0x0D, 0x3E, 0x0C}
+	pt = []byte{0xD1, 0xE7, 0x87, 0x74, 0x9C, 0x72, 0x81, 0x4C}
+	ct = []byte{0xA0, 0x83, 0x82, 0x6A, 0x79, 0x0D, 0x3E, 0x0C}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0x72, 0x8F, 0xEE, 0x32, 0xF0, 0x4B, 0x4C, 0x65,
 		0x4A, 0xD7, 0xF6, 0x07, 0xD7, 0x1C, 0x66, 0x0C,
 		0x2C, 0x26, 0x70, 0xD7, 0xC9, 0x99, 0x71, 0x32,
 		0x33, 0x14, 0x9A, 0x1C, 0x0C, 0x17, 0xA1, 0xF0,
 	}
-	pt = [BlockSize]byte{0xD4, 0xC0, 0x53, 0x23, 0xA4, 0xF7, 0xA7, 0xB5}
-	ct = [BlockSize]byte{0x4D, 0x1F, 0x2E, 0x6B, 0x0D, 0x9D, 0xE2, 0xCE}
+	pt = []byte{0xD4, 0xC0, 0x53, 0x23, 0xA4, 0xF7, 0xA7, 0xB5}
+	ct = []byte{0x4D, 0x1F, 0x2E, 0x6B, 0x0D, 0x9D, 0xE2, 0xCE}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0x35, 0xFC, 0x96, 0x40, 0x22, 0x09, 0x50, 0x0F,
 		0xCF, 0xDE, 0xF5, 0x35, 0x2D, 0x1A, 0xBB, 0x03,
 		0x8F, 0xE3, 0x3F, 0xC0, 0xD9, 0xD5, 0x85, 0x12,
 		0xE5, 0x63, 0x70, 0xB2, 0x2B, 0xAA, 0x13, 0x3B,
 	}
-	pt = [BlockSize]byte{0x87, 0x42, 0xD9, 0xA0, 0x5F, 0x6A, 0x3A, 0xF6}
-	ct = [BlockSize]byte{0x2F, 0x3B, 0xB8, 0x48, 0x79, 0xD1, 0x1E, 0x52}
+	pt = []byte{0x87, 0x42, 0xD9, 0xA0, 0x5F, 0x6A, 0x3A, 0xF6}
+	ct = []byte{0x2F, 0x3B, 0xB8, 0x48, 0x79, 0xD1, 0x1E, 0x52}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 
-	key = [KeySize]byte{
+	key = []byte{
 		0xD4, 0x16, 0xF6, 0x30, 0xBE, 0x65, 0xB7, 0xFE,
 		0x15, 0x06, 0x56, 0x18, 0x33, 0x70, 0xE0, 0x70,
 		0x18, 0x23, 0x4E, 0xE5, 0xDA, 0x3D, 0x89, 0xC4,
 		0xCE, 0x91, 0x52, 0xA0, 0x3E, 0x5B, 0xFB, 0x77,
 	}
-	pt = [BlockSize]byte{0xF8, 0x65, 0x06, 0xDA, 0x04, 0xE4, 0x1C, 0xB8}
-	ct = [BlockSize]byte{0x96, 0xF0, 0xA5, 0xC7, 0x7A, 0x04, 0xF5, 0xCE}
+	pt = []byte{0xF8, 0x65, 0x06, 0xDA, 0x04, 0xE4, 0x1C, 0xB8}
+	ct = []byte{0x96, 0xF0, 0xA5, 0xC7, 0x7A, 0x04, 0xF5, 0xCE}
 	c = NewCipher(key, sbox)
-	c.Encrypt(tmp, pt[:])
-	if bytes.Compare(tmp, ct[:]) != 0 {
+	c.Encrypt(tmp, pt)
+	if bytes.Compare(tmp, ct) != 0 {
 		t.Fail()
 	}
 }
 
 // http://cryptomanager.com/tv.html test vectors.
 func TestECBCryptomanager(t *testing.T) {
-	sbox := &SboxIdGostR341194TestParamSet
-	key := [KeySize]byte{
+	key := []byte{
 		0x75, 0x71, 0x31, 0x34, 0xB6, 0x0F, 0xEC, 0x45,
 		0xA6, 0x07, 0xBB, 0x83, 0xAA, 0x37, 0x46, 0xAF,
 		0x4F, 0xF9, 0x9D, 0xA6, 0xD1, 0xB5, 0x3B, 0x5B,
 		0x1B, 0x40, 0x2A, 0x1B, 0xAA, 0x03, 0x0D, 0x1B,
 	}
-	c := NewCipher(key, sbox)
+	c := NewCipher(key, &SboxIdGostR341194TestParamSet)
 	tmp := make([]byte, BlockSize)
 	c.Encrypt(tmp, []byte{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88})
 	if bytes.Compare(tmp, []byte{0x03, 0x25, 0x1E, 0x14, 0xF9, 0xD2, 0x8A, 0xCB}) != 0 {
@@ -251,8 +245,8 @@ func TestECBCryptomanager(t *testing.T) {
 }
 
 func TestECBInterface(t *testing.T) {
-	var key [32]byte
-	c := NewCipher(key, SboxDefault)
+	var key [KeySize]byte
+	c := NewCipher(key[:], SboxDefault)
 	var _ cipher.BlockMode = c.NewECBEncrypter()
 	var _ cipher.BlockMode = c.NewECBDecrypter()
 }