From: Sergey Matveev Date: Wed, 10 Jul 2019 14:10:55 +0000 (+0300) Subject: Split long lines X-Git-Tag: 3.0~12 X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=commitdiff_plain;h=7838a280e9d6c0578bdc2517e277934b3aaffe5c Split long lines --- diff --git a/src/cypherpunks.ru/gogost/gost3410/2001_test.go b/src/cypherpunks.ru/gogost/gost3410/2001_test.go index ba063df..8bccc62 100644 --- a/src/cypherpunks.ru/gogost/gost3410/2001_test.go +++ b/src/cypherpunks.ru/gogost/gost3410/2001_test.go @@ -172,7 +172,12 @@ func TestPrvEqualsTo1(t *testing.T) { if err != nil { t.FailNow() } - digest := []byte{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01} + digest := []byte{ + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + } sign, err := prv.SignDigest(digest, rand.Reader) if err != nil { t.FailNow() diff --git a/src/cypherpunks.ru/gogost/gost341194/pbkdf2_test.go b/src/cypherpunks.ru/gogost/gost341194/pbkdf2_test.go index bd1a9a6..89f2ccd 100644 --- a/src/cypherpunks.ru/gogost/gost341194/pbkdf2_test.go +++ b/src/cypherpunks.ru/gogost/gost341194/pbkdf2_test.go @@ -38,7 +38,12 @@ func TestPBKDF2Vectors(t *testing.T) { 1, 32, PBKDF2Hash, - ), []byte{0x73, 0x14, 0xe7, 0xc0, 0x4f, 0xb2, 0xe6, 0x62, 0xc5, 0x43, 0x67, 0x42, 0x53, 0xf6, 0x8b, 0xd0, 0xb7, 0x34, 0x45, 0xd0, 0x7f, 0x24, 0x1b, 0xed, 0x87, 0x28, 0x82, 0xda, 0x21, 0x66, 0x2d, 0x58}) != 0 { + ), []byte{ + 0x73, 0x14, 0xe7, 0xc0, 0x4f, 0xb2, 0xe6, 0x62, + 0xc5, 0x43, 0x67, 0x42, 0x53, 0xf6, 0x8b, 0xd0, + 0xb7, 0x34, 0x45, 0xd0, 0x7f, 0x24, 0x1b, 0xed, + 0x87, 0x28, 0x82, 0xda, 0x21, 0x66, 0x2d, 0x58, + }) != 0 { t.Fail() } if bytes.Compare(pbkdf2.Key( @@ -47,7 +52,12 @@ func TestPBKDF2Vectors(t *testing.T) { 2, 32, PBKDF2Hash, - ), []byte{0x99, 0x0d, 0xfa, 0x2b, 0xd9, 0x65, 0x63, 0x9b, 0xa4, 0x8b, 0x07, 0xb7, 0x92, 0x77, 0x5d, 0xf7, 0x9f, 0x2d, 0xb3, 0x4f, 0xef, 0x25, 0xf2, 0x74, 0x37, 0x88, 0x72, 0xfe, 0xd7, 0xed, 0x1b, 0xb3}) != 0 { + ), []byte{ + 0x99, 0x0d, 0xfa, 0x2b, 0xd9, 0x65, 0x63, 0x9b, + 0xa4, 0x8b, 0x07, 0xb7, 0x92, 0x77, 0x5d, 0xf7, + 0x9f, 0x2d, 0xb3, 0x4f, 0xef, 0x25, 0xf2, 0x74, + 0x37, 0x88, 0x72, 0xfe, 0xd7, 0xed, 0x1b, 0xb3, + }) != 0 { t.Fail() } if bytes.Compare(pbkdf2.Key( @@ -56,20 +66,29 @@ func TestPBKDF2Vectors(t *testing.T) { 4096, 32, PBKDF2Hash, - ), []byte{0x1f, 0x18, 0x29, 0xa9, 0x4b, 0xdf, 0xf5, 0xbe, 0x10, 0xd0, 0xae, 0xb3, 0x6a, 0xf4, 0x98, 0xe7, 0xa9, 0x74, 0x67, 0xf3, 0xb3, 0x11, 0x16, 0xa5, 0xa7, 0xc1, 0xaf, 0xff, 0x9d, 0xea, 0xda, 0xfe}) != 0 { + ), []byte{ + 0x1f, 0x18, 0x29, 0xa9, 0x4b, 0xdf, 0xf5, 0xbe, + 0x10, 0xd0, 0xae, 0xb3, 0x6a, 0xf4, 0x98, 0xe7, + 0xa9, 0x74, 0x67, 0xf3, 0xb3, 0x11, 0x16, 0xa5, + 0xa7, 0xc1, 0xaf, 0xff, 0x9d, 0xea, 0xda, 0xfe, + }) != 0 { + t.Fail() + } + /* It takes too long + if bytes.Compare(pbkdf2.Key( + []byte("password"), + []byte("salt"), + 16777216, + 32, + PBKDF2Hash, + ), []byte{ + 0xa5, 0x7a, 0xe5, 0xa6, 0x08, 0x83, 0x96, 0xd1, + 0x20, 0x85, 0x0c, 0x5c, 0x09, 0xde, 0x0a, 0x52, + 0x51, 0x00, 0x93, 0x8a, 0x59, 0xb1, 0xb5, 0xc3, + 0xf7, 0x81, 0x09, 0x10, 0xd0, 0x5f, 0xcd, 0x97, + }) != 0 { t.Fail() } - /* - // It takes too long - if bytes.Compare(pbkdf2.Key( - []byte("password"), - []byte("salt"), - 16777216, - 32, - PBKDF2Hash, - ), []byte{0xa5, 0x7a, 0xe5, 0xa6, 0x08, 0x83, 0x96, 0xd1, 0x20, 0x85, 0x0c, 0x5c, 0x09, 0xde, 0x0a, 0x52, 0x51, 0x00, 0x93, 0x8a, 0x59, 0xb1, 0xb5, 0xc3, 0xf7, 0x81, 0x09, 0x10, 0xd0, 0x5f, 0xcd, 0x97}) != 0 { - t.Fail() - } */ if bytes.Compare(pbkdf2.Key( []byte("passwordPASSWORDpassword"), @@ -77,7 +96,13 @@ func TestPBKDF2Vectors(t *testing.T) { 4096, 40, PBKDF2Hash, - ), []byte{0x78, 0x83, 0x58, 0xc6, 0x9c, 0xb2, 0xdb, 0xe2, 0x51, 0xa7, 0xbb, 0x17, 0xd5, 0xf4, 0x24, 0x1f, 0x26, 0x5a, 0x79, 0x2a, 0x35, 0xbe, 0xcd, 0xe8, 0xd5, 0x6f, 0x32, 0x6b, 0x49, 0xc8, 0x50, 0x47, 0xb7, 0x63, 0x8a, 0xcb, 0x47, 0x64, 0xb1, 0xfd}) != 0 { + ), []byte{ + 0x78, 0x83, 0x58, 0xc6, 0x9c, 0xb2, 0xdb, 0xe2, + 0x51, 0xa7, 0xbb, 0x17, 0xd5, 0xf4, 0x24, 0x1f, + 0x26, 0x5a, 0x79, 0x2a, 0x35, 0xbe, 0xcd, 0xe8, + 0xd5, 0x6f, 0x32, 0x6b, 0x49, 0xc8, 0x50, 0x47, + 0xb7, 0x63, 0x8a, 0xcb, 0x47, 0x64, 0xb1, 0xfd, + }) != 0 { t.Fail() } if bytes.Compare(pbkdf2.Key( @@ -86,7 +111,11 @@ func TestPBKDF2Vectors(t *testing.T) { 4096, 20, PBKDF2Hash, - ), []byte{0x43, 0xe0, 0x6c, 0x55, 0x90, 0xb0, 0x8c, 0x02, 0x25, 0x24, 0x23, 0x73, 0x12, 0x7e, 0xdf, 0x9c, 0x8e, 0x9c, 0x32, 0x91}) != 0 { + ), []byte{ + 0x43, 0xe0, 0x6c, 0x55, 0x90, 0xb0, 0x8c, 0x02, + 0x25, 0x24, 0x23, 0x73, 0x12, 0x7e, 0xdf, 0x9c, + 0x8e, 0x9c, 0x32, 0x91, + }) != 0 { t.Fail() } }