]> Cypherpunks.ru repositories - gogost.git/commitdiff
Split some tests to subtests
authorSergey Matveev <stargrave@stargrave.org>
Fri, 26 Jul 2019 09:59:27 +0000 (12:59 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Fri, 26 Jul 2019 09:59:27 +0000 (12:59 +0300)
src/cypherpunks.ru/gogost/gost28147/ecb_test.go
src/cypherpunks.ru/gogost/gost28147/mac_test.go
src/cypherpunks.ru/gogost/gost341194/hash_test.go
src/cypherpunks.ru/gogost/gost341194/pbkdf2_test.go
src/cypherpunks.ru/gogost/internal/gost34112012/hash_test.go
src/cypherpunks.ru/gogost/internal/gost34112012/hmac_test.go

index 9a0f08b3f5b4c91021b337fbe53b228bc64f26e8..0d2cf1106e3d0fe52c94c833d482f93b803f0163 100644 (file)
@@ -115,117 +115,138 @@ func TestECBGCL3Vectors(t *testing.T) {
 func TestECBCryptoPPVectors(t *testing.T) {
        sbox := &SboxAppliedCryptographyParamSet
        tmp := make([]byte, BlockSize)
-       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 := []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.FailNow()
-       }
+       var key []byte
+       var pt []byte
+       var ct []byte
+       var c *Cipher
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("1", func(t *testing.T) {
+               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 = []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.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("2", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("3", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("4", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("5", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("6", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 
-       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 = []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 {
-               t.FailNow()
-       }
+       t.Run("7", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
+
+       t.Run("8", func(t *testing.T) {
+               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 = []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 {
+                       t.FailNow()
+               }
+       })
 }
 
 // http://cryptomanager.com/tv.html test vectors.
index 9f85665b7e3fd8af776994262e3e988e2ac07695..fe07bafce78199ddfb8e7553b49efabd97f7a18c 100644 (file)
@@ -33,32 +33,40 @@ func TestMACVectors(t *testing.T) {
                t.FailNow()
        }
 
-       m.Write([]byte("a"))
-       if bytes.Compare(m.Sum(nil), []byte{0xbd, 0x5d, 0x3b, 0x5b, 0x2b, 0x7b, 0x57, 0xaf}) != 0 {
-               t.FailNow()
-       }
+       t.Run("a", func(t *testing.T) {
+               m.Write([]byte("a"))
+               if bytes.Compare(m.Sum(nil), []byte{0xbd, 0x5d, 0x3b, 0x5b, 0x2b, 0x7b, 0x57, 0xaf}) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       m.Reset()
-       m.Write([]byte("abc"))
-       if bytes.Compare(m.Sum(nil), []byte{0x28, 0x66, 0x1e, 0x40, 0x80, 0x5b, 0x1f, 0xf9}) != 0 {
-               t.FailNow()
-       }
+       t.Run("abc", func(t *testing.T) {
+               m.Reset()
+               m.Write([]byte("abc"))
+               if bytes.Compare(m.Sum(nil), []byte{0x28, 0x66, 0x1e, 0x40, 0x80, 0x5b, 0x1f, 0xf9}) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       m.Reset()
-       for i := 0; i < 128; i++ {
-               m.Write([]byte("U"))
-       }
-       if bytes.Compare(m.Sum(nil), []byte{0x1a, 0x06, 0xd1, 0xba, 0xd7, 0x45, 0x80, 0xef}) != 0 {
-               t.FailNow()
-       }
+       t.Run("128U", func(t *testing.T) {
+               m.Reset()
+               for i := 0; i < 128; i++ {
+                       m.Write([]byte("U"))
+               }
+               if bytes.Compare(m.Sum(nil), []byte{0x1a, 0x06, 0xd1, 0xba, 0xd7, 0x45, 0x80, 0xef}) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       m.Reset()
-       for i := 0; i < 13; i++ {
-               m.Write([]byte("x"))
-       }
-       if bytes.Compare(m.Sum(nil), []byte{0x91, 0x7e, 0xe1, 0xf1, 0xa6, 0x68, 0xfb, 0xd3}) != 0 {
-               t.FailNow()
-       }
+       t.Run("xxxxxxxxxxxxx", func(t *testing.T) {
+               m.Reset()
+               for i := 0; i < 13; i++ {
+                       m.Write([]byte("x"))
+               }
+               if bytes.Compare(m.Sum(nil), []byte{0x91, 0x7e, 0xe1, 0xf1, 0xa6, 0x68, 0xfb, 0xd3}) != 0 {
+                       t.FailNow()
+               }
+       })
 }
 
 func TestMACRandom(t *testing.T) {
index 49f86289be97c25c30b8d64aac4026febf8c12b3..d2214cfded19d553c08d6ed47a0c2ef7c63145b8 100644 (file)
@@ -34,196 +34,230 @@ func TestHashInterface(t *testing.T) {
 func TestVectors(t *testing.T) {
        h := New(SboxDefault)
 
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xce, 0x85, 0xb9, 0x9c, 0xc4, 0x67, 0x52, 0xff,
-               0xfe, 0xe3, 0x5c, 0xab, 0x9a, 0x7b, 0x02, 0x78,
-               0xab, 0xb4, 0xc2, 0xd2, 0x05, 0x5c, 0xff, 0x68,
-               0x5a, 0xf4, 0x91, 0x2c, 0x49, 0x49, 0x0f, 0x8d,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("empty", func(t *testing.T) {
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xce, 0x85, 0xb9, 0x9c, 0xc4, 0x67, 0x52, 0xff,
+                       0xfe, 0xe3, 0x5c, 0xab, 0x9a, 0x7b, 0x02, 0x78,
+                       0xab, 0xb4, 0xc2, 0xd2, 0x05, 0x5c, 0xff, 0x68,
+                       0x5a, 0xf4, 0x91, 0x2c, 0x49, 0x49, 0x0f, 0x8d,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("a"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xd4, 0x2c, 0x53, 0x9e, 0x36, 0x7c, 0x66, 0xe9,
-               0xc8, 0x8a, 0x80, 0x1f, 0x66, 0x49, 0x34, 0x9c,
-               0x21, 0x87, 0x1b, 0x43, 0x44, 0xc6, 0xa5, 0x73,
-               0xf8, 0x49, 0xfd, 0xce, 0x62, 0xf3, 0x14, 0xdd,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("a", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("a"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xd4, 0x2c, 0x53, 0x9e, 0x36, 0x7c, 0x66, 0xe9,
+                       0xc8, 0x8a, 0x80, 0x1f, 0x66, 0x49, 0x34, 0x9c,
+                       0x21, 0x87, 0x1b, 0x43, 0x44, 0xc6, 0xa5, 0x73,
+                       0xf8, 0x49, 0xfd, 0xce, 0x62, 0xf3, 0x14, 0xdd,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("abc"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xf3, 0x13, 0x43, 0x48, 0xc4, 0x4f, 0xb1, 0xb2,
-               0xa2, 0x77, 0x72, 0x9e, 0x22, 0x85, 0xeb, 0xb5,
-               0xcb, 0x5e, 0x0f, 0x29, 0xc9, 0x75, 0xbc, 0x75,
-               0x3b, 0x70, 0x49, 0x7c, 0x06, 0xa4, 0xd5, 0x1d,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("abc", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("abc"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xf3, 0x13, 0x43, 0x48, 0xc4, 0x4f, 0xb1, 0xb2,
+                       0xa2, 0x77, 0x72, 0x9e, 0x22, 0x85, 0xeb, 0xb5,
+                       0xcb, 0x5e, 0x0f, 0x29, 0xc9, 0x75, 0xbc, 0x75,
+                       0x3b, 0x70, 0x49, 0x7c, 0x06, 0xa4, 0xd5, 0x1d,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("message digest"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xad, 0x44, 0x34, 0xec, 0xb1, 0x8f, 0x2c, 0x99,
-               0xb6, 0x0c, 0xbe, 0x59, 0xec, 0x3d, 0x24, 0x69,
-               0x58, 0x2b, 0x65, 0x27, 0x3f, 0x48, 0xde, 0x72,
-               0xdb, 0x2f, 0xde, 0x16, 0xa4, 0x88, 0x9a, 0x4d,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("message digest", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("message digest"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xad, 0x44, 0x34, 0xec, 0xb1, 0x8f, 0x2c, 0x99,
+                       0xb6, 0x0c, 0xbe, 0x59, 0xec, 0x3d, 0x24, 0x69,
+                       0x58, 0x2b, 0x65, 0x27, 0x3f, 0x48, 0xde, 0x72,
+                       0xdb, 0x2f, 0xde, 0x16, 0xa4, 0x88, 0x9a, 0x4d,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       for i := 0; i < 128; i++ {
-               h.Write([]byte("U"))
-       }
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x53, 0xa3, 0xa3, 0xed, 0x25, 0x18, 0x0c, 0xef,
-               0x0c, 0x1d, 0x85, 0xa0, 0x74, 0x27, 0x3e, 0x55,
-               0x1c, 0x25, 0x66, 0x0a, 0x87, 0x06, 0x2a, 0x52,
-               0xd9, 0x26, 0xa9, 0xe8, 0xfe, 0x57, 0x33, 0xa4,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("128U", func(t *testing.T) {
+               h.Reset()
+               for i := 0; i < 128; i++ {
+                       h.Write([]byte("U"))
+               }
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x53, 0xa3, 0xa3, 0xed, 0x25, 0x18, 0x0c, 0xef,
+                       0x0c, 0x1d, 0x85, 0xa0, 0x74, 0x27, 0x3e, 0x55,
+                       0x1c, 0x25, 0x66, 0x0a, 0x87, 0x06, 0x2a, 0x52,
+                       0xd9, 0x26, 0xa9, 0xe8, 0xfe, 0x57, 0x33, 0xa4,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("The quick brown fox jumps over the lazy dog"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x77, 0xb7, 0xfa, 0x41, 0x0c, 0x9a, 0xc5, 0x8a,
-               0x25, 0xf4, 0x9b, 0xca, 0x7d, 0x04, 0x68, 0xc9,
-               0x29, 0x65, 0x29, 0x31, 0x5e, 0xac, 0xa7, 0x6b,
-               0xd1, 0xa1, 0x0f, 0x37, 0x6d, 0x1f, 0x42, 0x94,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("lazy dog", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("The quick brown fox jumps over the lazy dog"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x77, 0xb7, 0xfa, 0x41, 0x0c, 0x9a, 0xc5, 0x8a,
+                       0x25, 0xf4, 0x9b, 0xca, 0x7d, 0x04, 0x68, 0xc9,
+                       0x29, 0x65, 0x29, 0x31, 0x5e, 0xac, 0xa7, 0x6b,
+                       0xd1, 0xa1, 0x0f, 0x37, 0x6d, 0x1f, 0x42, 0x94,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("The quick brown fox jumps over the lazy cog"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xa3, 0xeb, 0xc4, 0xda, 0xaa, 0xb7, 0x8b, 0x0b,
-               0xe1, 0x31, 0xda, 0xb5, 0x73, 0x7a, 0x7f, 0x67,
-               0xe6, 0x02, 0x67, 0x0d, 0x54, 0x35, 0x21, 0x31,
-               0x91, 0x50, 0xd2, 0xe1, 0x4e, 0xee, 0xc4, 0x45,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("lazy cog", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("The quick brown fox jumps over the lazy cog"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xa3, 0xeb, 0xc4, 0xda, 0xaa, 0xb7, 0x8b, 0x0b,
+                       0xe1, 0x31, 0xda, 0xb5, 0x73, 0x7a, 0x7f, 0x67,
+                       0xe6, 0x02, 0x67, 0x0d, 0x54, 0x35, 0x21, 0x31,
+                       0x91, 0x50, 0xd2, 0xe1, 0x4e, 0xee, 0xc4, 0x45,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("This is message, length=32 bytes"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xb1, 0xc4, 0x66, 0xd3, 0x75, 0x19, 0xb8, 0x2e,
-               0x83, 0x19, 0x81, 0x9f, 0xf3, 0x25, 0x95, 0xe0,
-               0x47, 0xa2, 0x8c, 0xb6, 0xf8, 0x3e, 0xff, 0x1c,
-               0x69, 0x16, 0xa8, 0x15, 0xa6, 0x37, 0xff, 0xfa,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("32", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("This is message, length=32 bytes"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xb1, 0xc4, 0x66, 0xd3, 0x75, 0x19, 0xb8, 0x2e,
+                       0x83, 0x19, 0x81, 0x9f, 0xf3, 0x25, 0x95, 0xe0,
+                       0x47, 0xa2, 0x8c, 0xb6, 0xf8, 0x3e, 0xff, 0x1c,
+                       0x69, 0x16, 0xa8, 0x15, 0xa6, 0x37, 0xff, 0xfa,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("Suppose the original message has length = 50 bytes"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x47, 0x1a, 0xba, 0x57, 0xa6, 0x0a, 0x77, 0x0d,
-               0x3a, 0x76, 0x13, 0x06, 0x35, 0xc1, 0xfb, 0xea,
-               0x4e, 0xf1, 0x4d, 0xe5, 0x1f, 0x78, 0xb4, 0xae,
-               0x57, 0xdd, 0x89, 0x3b, 0x62, 0xf5, 0x52, 0x08,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("50", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("Suppose the original message has length = 50 bytes"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x47, 0x1a, 0xba, 0x57, 0xa6, 0x0a, 0x77, 0x0d,
+                       0x3a, 0x76, 0x13, 0x06, 0x35, 0xc1, 0xfb, 0xea,
+                       0x4e, 0xf1, 0x4d, 0xe5, 0x1f, 0x78, 0xb4, 0xae,
+                       0x57, 0xdd, 0x89, 0x3b, 0x62, 0xf5, 0x52, 0x08,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 }
 
 func TestVectorsCryptoPro(t *testing.T) {
        h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
 
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x98, 0x1e, 0x5f, 0x3c, 0xa3, 0x0c, 0x84, 0x14,
-               0x87, 0x83, 0x0f, 0x84, 0xfb, 0x43, 0x3e, 0x13,
-               0xac, 0x11, 0x01, 0x56, 0x9b, 0x9c, 0x13, 0x58,
-               0x4a, 0xc4, 0x83, 0x23, 0x4c, 0xd6, 0x56, 0xc0,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("empty", func(t *testing.T) {
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x98, 0x1e, 0x5f, 0x3c, 0xa3, 0x0c, 0x84, 0x14,
+                       0x87, 0x83, 0x0f, 0x84, 0xfb, 0x43, 0x3e, 0x13,
+                       0xac, 0x11, 0x01, 0x56, 0x9b, 0x9c, 0x13, 0x58,
+                       0x4a, 0xc4, 0x83, 0x23, 0x4c, 0xd6, 0x56, 0xc0,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("a"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xe7, 0x4c, 0x52, 0xdd, 0x28, 0x21, 0x83, 0xbf,
-               0x37, 0xaf, 0x00, 0x79, 0xc9, 0xf7, 0x80, 0x55,
-               0x71, 0x5a, 0x10, 0x3f, 0x17, 0xe3, 0x13, 0x3c,
-               0xef, 0xf1, 0xaa, 0xcf, 0x2f, 0x40, 0x30, 0x11,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("a", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("a"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xe7, 0x4c, 0x52, 0xdd, 0x28, 0x21, 0x83, 0xbf,
+                       0x37, 0xaf, 0x00, 0x79, 0xc9, 0xf7, 0x80, 0x55,
+                       0x71, 0x5a, 0x10, 0x3f, 0x17, 0xe3, 0x13, 0x3c,
+                       0xef, 0xf1, 0xaa, 0xcf, 0x2f, 0x40, 0x30, 0x11,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("abc"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xb2, 0x85, 0x05, 0x6d, 0xbf, 0x18, 0xd7, 0x39,
-               0x2d, 0x76, 0x77, 0x36, 0x95, 0x24, 0xdd, 0x14,
-               0x74, 0x74, 0x59, 0xed, 0x81, 0x43, 0x99, 0x7e,
-               0x16, 0x3b, 0x29, 0x86, 0xf9, 0x2f, 0xd4, 0x2c,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("abc", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("abc"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xb2, 0x85, 0x05, 0x6d, 0xbf, 0x18, 0xd7, 0x39,
+                       0x2d, 0x76, 0x77, 0x36, 0x95, 0x24, 0xdd, 0x14,
+                       0x74, 0x74, 0x59, 0xed, 0x81, 0x43, 0x99, 0x7e,
+                       0x16, 0x3b, 0x29, 0x86, 0xf9, 0x2f, 0xd4, 0x2c,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("message digest"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xbc, 0x60, 0x41, 0xdd, 0x2a, 0xa4, 0x01, 0xeb,
-               0xfa, 0x6e, 0x98, 0x86, 0x73, 0x41, 0x74, 0xfe,
-               0xbd, 0xb4, 0x72, 0x9a, 0xa9, 0x72, 0xd6, 0x0f,
-               0x54, 0x9a, 0xc3, 0x9b, 0x29, 0x72, 0x1b, 0xa0,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("message digest", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("message digest"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xbc, 0x60, 0x41, 0xdd, 0x2a, 0xa4, 0x01, 0xeb,
+                       0xfa, 0x6e, 0x98, 0x86, 0x73, 0x41, 0x74, 0xfe,
+                       0xbd, 0xb4, 0x72, 0x9a, 0xa9, 0x72, 0xd6, 0x0f,
+                       0x54, 0x9a, 0xc3, 0x9b, 0x29, 0x72, 0x1b, 0xa0,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("The quick brown fox jumps over the lazy dog"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x90, 0x04, 0x29, 0x4a, 0x36, 0x1a, 0x50, 0x8c,
-               0x58, 0x6f, 0xe5, 0x3d, 0x1f, 0x1b, 0x02, 0x74,
-               0x67, 0x65, 0xe7, 0x1b, 0x76, 0x54, 0x72, 0x78,
-               0x6e, 0x47, 0x70, 0xd5, 0x65, 0x83, 0x0a, 0x76,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("lazy dog", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("The quick brown fox jumps over the lazy dog"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x90, 0x04, 0x29, 0x4a, 0x36, 0x1a, 0x50, 0x8c,
+                       0x58, 0x6f, 0xe5, 0x3d, 0x1f, 0x1b, 0x02, 0x74,
+                       0x67, 0x65, 0xe7, 0x1b, 0x76, 0x54, 0x72, 0x78,
+                       0x6e, 0x47, 0x70, 0xd5, 0x65, 0x83, 0x0a, 0x76,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("This is message, length=32 bytes"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x2c, 0xef, 0xc2, 0xf7, 0xb7, 0xbd, 0xc5, 0x14,
-               0xe1, 0x8e, 0xa5, 0x7f, 0xa7, 0x4f, 0xf3, 0x57,
-               0xe7, 0xfa, 0x17, 0xd6, 0x52, 0xc7, 0x5f, 0x69,
-               0xcb, 0x1b, 0xe7, 0x89, 0x3e, 0xde, 0x48, 0xeb,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("32", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("This is message, length=32 bytes"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x2c, 0xef, 0xc2, 0xf7, 0xb7, 0xbd, 0xc5, 0x14,
+                       0xe1, 0x8e, 0xa5, 0x7f, 0xa7, 0x4f, 0xf3, 0x57,
+                       0xe7, 0xfa, 0x17, 0xd6, 0x52, 0xc7, 0x5f, 0x69,
+                       0xcb, 0x1b, 0xe7, 0x89, 0x3e, 0xde, 0x48, 0xeb,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       h.Write([]byte("Suppose the original message has length = 50 bytes"))
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xc3, 0x73, 0x0c, 0x5c, 0xbc, 0xca, 0xcf, 0x91,
-               0x5a, 0xc2, 0x92, 0x67, 0x6f, 0x21, 0xe8, 0xbd,
-               0x4e, 0xf7, 0x53, 0x31, 0xd9, 0x40, 0x5e, 0x5f,
-               0x1a, 0x61, 0xdc, 0x31, 0x30, 0xa6, 0x50, 0x11,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("50", func(t *testing.T) {
+               h.Reset()
+               h.Write([]byte("Suppose the original message has length = 50 bytes"))
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xc3, 0x73, 0x0c, 0x5c, 0xbc, 0xca, 0xcf, 0x91,
+                       0x5a, 0xc2, 0x92, 0x67, 0x6f, 0x21, 0xe8, 0xbd,
+                       0x4e, 0xf7, 0x53, 0x31, 0xd9, 0x40, 0x5e, 0x5f,
+                       0x1a, 0x61, 0xdc, 0x31, 0x30, 0xa6, 0x50, 0x11,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       h.Reset()
-       for i := 0; i < 128; i++ {
-               h.Write([]byte{'U'})
-       }
-       if bytes.Compare(h.Sum(nil), []byte{
-               0x1c, 0x4a, 0xc7, 0x61, 0x46, 0x91, 0xbb, 0xf4,
-               0x27, 0xfa, 0x23, 0x16, 0x21, 0x6b, 0xe8, 0xf1,
-               0x0d, 0x92, 0xed, 0xfd, 0x37, 0xcd, 0x10, 0x27,
-               0x51, 0x4c, 0x10, 0x08, 0xf6, 0x49, 0xc4, 0xe8,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("128U", func(t *testing.T) {
+               h.Reset()
+               for i := 0; i < 128; i++ {
+                       h.Write([]byte{'U'})
+               }
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0x1c, 0x4a, 0xc7, 0x61, 0x46, 0x91, 0xbb, 0xf4,
+                       0x27, 0xfa, 0x23, 0x16, 0x21, 0x6b, 0xe8, 0xf1,
+                       0x0d, 0x92, 0xed, 0xfd, 0x37, 0xcd, 0x10, 0x27,
+                       0x51, 0x4c, 0x10, 0x08, 0xf6, 0x49, 0xc4, 0xe8,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 }
 
 func TestRandom(t *testing.T) {
index a4088e0efa9b1df2e96f60a7d0243bf68713cb76..ed16bd26337431eede38b83088e07a2f29105d3d 100644 (file)
@@ -32,90 +32,107 @@ func PBKDF2Hash() hash.Hash {
 // Test vectors for PBKDF2 taken from
 // http://tc26.ru/methods/containers_v1/Addition_to_PKCS5_v1_0.pdf test vectors
 func TestPBKDF2Vectors(t *testing.T) {
-       if bytes.Compare(pbkdf2.Key(
-               []byte("password"),
-               []byte("salt"),
-               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 {
-               t.FailNow()
-       }
-       if bytes.Compare(pbkdf2.Key(
-               []byte("password"),
-               []byte("salt"),
-               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 {
-               t.FailNow()
-       }
-       if bytes.Compare(pbkdf2.Key(
-               []byte("password"),
-               []byte("salt"),
-               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 {
-               t.FailNow()
-       }
-       /* 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.FailNow()
-       }
+       t.Run("1", func(t *testing.T) {
+               if bytes.Compare(pbkdf2.Key(
+                       []byte("password"),
+                       []byte("salt"),
+                       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 {
+                       t.FailNow()
+               }
+       })
+
+       t.Run("2", func(t *testing.T) {
+               if bytes.Compare(pbkdf2.Key(
+                       []byte("password"),
+                       []byte("salt"),
+                       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 {
+                       t.FailNow()
+               }
+       })
+
+       t.Run("4096", func(t *testing.T) {
+               if bytes.Compare(pbkdf2.Key(
+                       []byte("password"),
+                       []byte("salt"),
+                       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 {
+                       t.FailNow()
+               }
+       })
+
+       /*
+               t.Run("16777216", func(t *testing.T) {
+                       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.FailNow()
+                       }
+               })
        */
-       if bytes.Compare(pbkdf2.Key(
-               []byte("passwordPASSWORDpassword"),
-               []byte("saltSALTsaltSALTsaltSALTsaltSALTsalt"),
-               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 {
-               t.FailNow()
-       }
-       if bytes.Compare(pbkdf2.Key(
-               []byte("pass\x00word"),
-               []byte("sa\x00lt"),
-               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 {
-               t.FailNow()
-       }
+
+       t.Run("many", func(t *testing.T) {
+               if bytes.Compare(pbkdf2.Key(
+                       []byte("passwordPASSWORDpassword"),
+                       []byte("saltSALTsaltSALTsaltSALTsaltSALTsalt"),
+                       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 {
+                       t.FailNow()
+               }
+       })
+
+       t.Run("zero byte", func(t *testing.T) {
+               if bytes.Compare(pbkdf2.Key(
+                       []byte("pass\x00word"),
+                       []byte("sa\x00lt"),
+                       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 {
+                       t.FailNow()
+               }
+       })
 }
index b9422b7105ea96b5e9e804668a17a9530e4c506b..1e0df645c6eb8d57dbd35beccaf61057c82e3b2c 100644 (file)
@@ -33,110 +33,113 @@ func TestVectors(t *testing.T) {
        h512 := New(64)
        h256 := New(32)
 
-       // First vector
-       m := []byte{
-               0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-               0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-               0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33,
-               0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31,
-               0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-               0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-               0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-               0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32,
-       }
-       h512.Write(m)
-       if bytes.Compare(h512.Sum(nil), []byte{
-               0x1b, 0x54, 0xd0, 0x1a, 0x4a, 0xf5, 0xb9, 0xd5,
-               0xcc, 0x3d, 0x86, 0xd6, 0x8d, 0x28, 0x54, 0x62,
-               0xb1, 0x9a, 0xbc, 0x24, 0x75, 0x22, 0x2f, 0x35,
-               0xc0, 0x85, 0x12, 0x2b, 0xe4, 0xba, 0x1f, 0xfa,
-               0x00, 0xad, 0x30, 0xf8, 0x76, 0x7b, 0x3a, 0x82,
-               0x38, 0x4c, 0x65, 0x74, 0xf0, 0x24, 0xc3, 0x11,
-               0xe2, 0xa4, 0x81, 0x33, 0x2b, 0x08, 0xef, 0x7f,
-               0x41, 0x79, 0x78, 0x91, 0xc1, 0x64, 0x6f, 0x48,
-       }) != 0 {
-               t.FailNow()
-       }
-       h256.Write(m)
-       if bytes.Compare(h256.Sum(nil), []byte{
-               0x9d, 0x15, 0x1e, 0xef, 0xd8, 0x59, 0x0b, 0x89,
-               0xda, 0xa6, 0xba, 0x6c, 0xb7, 0x4a, 0xf9, 0x27,
-               0x5d, 0xd0, 0x51, 0x02, 0x6b, 0xb1, 0x49, 0xa4,
-               0x52, 0xfd, 0x84, 0xe5, 0xe5, 0x7b, 0x55, 0x00,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("1", func(t *testing.T) {
+               m := []byte{
+                       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+                       0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
+                       0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33,
+                       0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31,
+                       0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+                       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+                       0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
+                       0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32,
+               }
+               h512.Write(m)
+               if bytes.Compare(h512.Sum(nil), []byte{
+                       0x1b, 0x54, 0xd0, 0x1a, 0x4a, 0xf5, 0xb9, 0xd5,
+                       0xcc, 0x3d, 0x86, 0xd6, 0x8d, 0x28, 0x54, 0x62,
+                       0xb1, 0x9a, 0xbc, 0x24, 0x75, 0x22, 0x2f, 0x35,
+                       0xc0, 0x85, 0x12, 0x2b, 0xe4, 0xba, 0x1f, 0xfa,
+                       0x00, 0xad, 0x30, 0xf8, 0x76, 0x7b, 0x3a, 0x82,
+                       0x38, 0x4c, 0x65, 0x74, 0xf0, 0x24, 0xc3, 0x11,
+                       0xe2, 0xa4, 0x81, 0x33, 0x2b, 0x08, 0xef, 0x7f,
+                       0x41, 0x79, 0x78, 0x91, 0xc1, 0x64, 0x6f, 0x48,
+               }) != 0 {
+                       t.FailNow()
+               }
+               h256.Write(m)
+               if bytes.Compare(h256.Sum(nil), []byte{
+                       0x9d, 0x15, 0x1e, 0xef, 0xd8, 0x59, 0x0b, 0x89,
+                       0xda, 0xa6, 0xba, 0x6c, 0xb7, 0x4a, 0xf9, 0x27,
+                       0x5d, 0xd0, 0x51, 0x02, 0x6b, 0xb1, 0x49, 0xa4,
+                       0x52, 0xfd, 0x84, 0xe5, 0xe5, 0x7b, 0x55, 0x00,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       // Second vector
-       // It is CP1251-encoded "Се ветри, Стрибожи внуци, веютъ с моря
-       // стрелами на храбрыя плъкы Игоревы" string
-       h512.Reset()
-       h256.Reset()
-       m = []byte{
-               0xd1, 0xe5, 0x20, 0xe2, 0xe5, 0xf2, 0xf0, 0xe8,
-               0x2c, 0x20, 0xd1, 0xf2, 0xf0, 0xe8, 0xe1, 0xee,
-               0xe6, 0xe8, 0x20, 0xe2, 0xed, 0xf3, 0xf6, 0xe8,
-               0x2c, 0x20, 0xe2, 0xe5, 0xfe, 0xf2, 0xfa, 0x20,
-               0xf1, 0x20, 0xec, 0xee, 0xf0, 0xff, 0x20, 0xf1,
-               0xf2, 0xf0, 0xe5, 0xeb, 0xe0, 0xec, 0xe8, 0x20,
-               0xed, 0xe0, 0x20, 0xf5, 0xf0, 0xe0, 0xe1, 0xf0,
-               0xfb, 0xff, 0x20, 0xef, 0xeb, 0xfa, 0xea, 0xfb,
-               0x20, 0xc8, 0xe3, 0xee, 0xf0, 0xe5, 0xe2, 0xfb,
-       }
-       h512.Write(m)
-       if bytes.Compare(h512.Sum(nil), []byte{
-               0x1e, 0x88, 0xe6, 0x22, 0x26, 0xbf, 0xca, 0x6f,
-               0x99, 0x94, 0xf1, 0xf2, 0xd5, 0x15, 0x69, 0xe0,
-               0xda, 0xf8, 0x47, 0x5a, 0x3b, 0x0f, 0xe6, 0x1a,
-               0x53, 0x00, 0xee, 0xe4, 0x6d, 0x96, 0x13, 0x76,
-               0x03, 0x5f, 0xe8, 0x35, 0x49, 0xad, 0xa2, 0xb8,
-               0x62, 0x0f, 0xcd, 0x7c, 0x49, 0x6c, 0xe5, 0xb3,
-               0x3f, 0x0c, 0xb9, 0xdd, 0xdc, 0x2b, 0x64, 0x60,
-               0x14, 0x3b, 0x03, 0xda, 0xba, 0xc9, 0xfb, 0x28,
-       }) != 0 {
-               t.FailNow()
-       }
-       h256.Write(m)
-       if bytes.Compare(h256.Sum(nil), []byte{
-               0x9d, 0xd2, 0xfe, 0x4e, 0x90, 0x40, 0x9e, 0x5d,
-               0xa8, 0x7f, 0x53, 0x97, 0x6d, 0x74, 0x05, 0xb0,
-               0xc0, 0xca, 0xc6, 0x28, 0xfc, 0x66, 0x9a, 0x74,
-               0x1d, 0x50, 0x06, 0x3c, 0x55, 0x7e, 0x8f, 0x50,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("Се ветри", func(t *testing.T) {
+               // It is CP1251-encoded "Се ветри, Стрибожи внуци, веютъ с моря
+               // стрелами на храбрыя плъкы Игоревы" string
+               h512.Reset()
+               h256.Reset()
+               m := []byte{
+                       0xd1, 0xe5, 0x20, 0xe2, 0xe5, 0xf2, 0xf0, 0xe8,
+                       0x2c, 0x20, 0xd1, 0xf2, 0xf0, 0xe8, 0xe1, 0xee,
+                       0xe6, 0xe8, 0x20, 0xe2, 0xed, 0xf3, 0xf6, 0xe8,
+                       0x2c, 0x20, 0xe2, 0xe5, 0xfe, 0xf2, 0xfa, 0x20,
+                       0xf1, 0x20, 0xec, 0xee, 0xf0, 0xff, 0x20, 0xf1,
+                       0xf2, 0xf0, 0xe5, 0xeb, 0xe0, 0xec, 0xe8, 0x20,
+                       0xed, 0xe0, 0x20, 0xf5, 0xf0, 0xe0, 0xe1, 0xf0,
+                       0xfb, 0xff, 0x20, 0xef, 0xeb, 0xfa, 0xea, 0xfb,
+                       0x20, 0xc8, 0xe3, 0xee, 0xf0, 0xe5, 0xe2, 0xfb,
+               }
+               h512.Write(m)
+               if bytes.Compare(h512.Sum(nil), []byte{
+                       0x1e, 0x88, 0xe6, 0x22, 0x26, 0xbf, 0xca, 0x6f,
+                       0x99, 0x94, 0xf1, 0xf2, 0xd5, 0x15, 0x69, 0xe0,
+                       0xda, 0xf8, 0x47, 0x5a, 0x3b, 0x0f, 0xe6, 0x1a,
+                       0x53, 0x00, 0xee, 0xe4, 0x6d, 0x96, 0x13, 0x76,
+                       0x03, 0x5f, 0xe8, 0x35, 0x49, 0xad, 0xa2, 0xb8,
+                       0x62, 0x0f, 0xcd, 0x7c, 0x49, 0x6c, 0xe5, 0xb3,
+                       0x3f, 0x0c, 0xb9, 0xdd, 0xdc, 0x2b, 0x64, 0x60,
+                       0x14, 0x3b, 0x03, 0xda, 0xba, 0xc9, 0xfb, 0x28,
+               }) != 0 {
+                       t.FailNow()
+               }
+               h256.Write(m)
+               if bytes.Compare(h256.Sum(nil), []byte{
+                       0x9d, 0xd2, 0xfe, 0x4e, 0x90, 0x40, 0x9e, 0x5d,
+                       0xa8, 0x7f, 0x53, 0x97, 0x6d, 0x74, 0x05, 0xb0,
+                       0xc0, 0xca, 0xc6, 0x28, 0xfc, 0x66, 0x9a, 0x74,
+                       0x1d, 0x50, 0x06, 0x3c, 0x55, 0x7e, 0x8f, 0x50,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 
-       // Test vector from https://habr.com/ru/post/450024/
-       h256.Reset()
-       m = []byte{
-               0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x3e, 0x00, 0x03, 0x00, 0xfe, 0xff, 0x09, 0x00,
-               0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-               0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x10, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
-               0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-       }
-       h256.Write(m)
-       if bytes.Compare(h256.Sum(nil), []byte{
-               0xc7, 0x66, 0x08, 0x55, 0x40, 0xca, 0xaa, 0x89,
-               0x53, 0xbf, 0xcf, 0x7a, 0x1b, 0xa2, 0x20, 0x61,
-               0x9c, 0xee, 0x50, 0xd6, 0x5d, 0xc2, 0x42, 0xf8,
-               0x2f, 0x23, 0xba, 0x4b, 0x18, 0x0b, 0x18, 0xe0,
-       }) != 0 {
-               t.FailNow()
-       }
+       t.Run("https://habr.com/ru/post/450024/", func(t *testing.T) {
+               h256.Reset()
+               m := []byte{
+                       0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x3e, 0x00, 0x03, 0x00, 0xfe, 0xff, 0x09, 0x00,
+                       0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x10, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+               }
+               h256.Write(m)
+               if bytes.Compare(h256.Sum(nil), []byte{
+                       0xc7, 0x66, 0x08, 0x55, 0x40, 0xca, 0xaa, 0x89,
+                       0x53, 0xbf, 0xcf, 0x7a, 0x1b, 0xa2, 0x20, 0x61,
+                       0x9c, 0xee, 0x50, 0xd6, 0x5d, 0xc2, 0x42, 0xf8,
+                       0x2f, 0x23, 0xba, 0x4b, 0x18, 0x0b, 0x18, 0xe0,
+               }) != 0 {
+                       t.FailNow()
+               }
+       })
 }
 
 func TestBlocksized(t *testing.T) {
index 859d484f441f1544b34384275f357860b5b8cbc2..7706bcaa7fc23b8b96bce64d7469e97ad7894dfb 100644 (file)
@@ -34,45 +34,49 @@ func hash512() hash.Hash {
 // HMAC test vectors taken from
 // http://tc26.ru/methods/recommendation/%D0%A2%D0%9A26%D0%90%D0%9B%D0%93.pdf test vectors
 func TestHMACVectors(t *testing.T) {
-       h := hmac.New(hash256, []byte{
-               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-               0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-               0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+       t.Run("256", func(t *testing.T) {
+               h := hmac.New(hash256, []byte{
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+               })
+               h.Write([]byte{
+                       0x01, 0x26, 0xbd, 0xb8, 0x78, 0x00, 0xaf, 0x21,
+                       0x43, 0x41, 0x45, 0x65, 0x63, 0x78, 0x01, 0x00,
+               })
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xa1, 0xaa, 0x5f, 0x7d, 0xe4, 0x02, 0xd7, 0xb3,
+                       0xd3, 0x23, 0xf2, 0x99, 0x1c, 0x8d, 0x45, 0x34,
+                       0x01, 0x31, 0x37, 0x01, 0x0a, 0x83, 0x75, 0x4f,
+                       0xd0, 0xaf, 0x6d, 0x7c, 0xd4, 0x92, 0x2e, 0xd9,
+               }) != 0 {
+                       t.FailNow()
+               }
        })
-       h.Write([]byte{
-               0x01, 0x26, 0xbd, 0xb8, 0x78, 0x00, 0xaf, 0x21,
-               0x43, 0x41, 0x45, 0x65, 0x63, 0x78, 0x01, 0x00,
-       })
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xa1, 0xaa, 0x5f, 0x7d, 0xe4, 0x02, 0xd7, 0xb3,
-               0xd3, 0x23, 0xf2, 0x99, 0x1c, 0x8d, 0x45, 0x34,
-               0x01, 0x31, 0x37, 0x01, 0x0a, 0x83, 0x75, 0x4f,
-               0xd0, 0xaf, 0x6d, 0x7c, 0xd4, 0x92, 0x2e, 0xd9,
-       }) != 0 {
-               t.FailNow()
-       }
 
-       h = hmac.New(hash512, []byte{
-               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-               0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-               0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-       })
-       h.Write([]byte{
-               0x01, 0x26, 0xbd, 0xb8, 0x78, 0x00, 0xaf, 0x21,
-               0x43, 0x41, 0x45, 0x65, 0x63, 0x78, 0x01, 0x00,
+       t.Run("512", func(t *testing.T) {
+               h := hmac.New(hash512, []byte{
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+               })
+               h.Write([]byte{
+                       0x01, 0x26, 0xbd, 0xb8, 0x78, 0x00, 0xaf, 0x21,
+                       0x43, 0x41, 0x45, 0x65, 0x63, 0x78, 0x01, 0x00,
+               })
+               if bytes.Compare(h.Sum(nil), []byte{
+                       0xa5, 0x9b, 0xab, 0x22, 0xec, 0xae, 0x19, 0xc6,
+                       0x5f, 0xbd, 0xe6, 0xe5, 0xf4, 0xe9, 0xf5, 0xd8,
+                       0x54, 0x9d, 0x31, 0xf0, 0x37, 0xf9, 0xdf, 0x9b,
+                       0x90, 0x55, 0x00, 0xe1, 0x71, 0x92, 0x3a, 0x77,
+                       0x3d, 0x5f, 0x15, 0x30, 0xf2, 0xed, 0x7e, 0x96,
+                       0x4c, 0xb2, 0xee, 0xdc, 0x29, 0xe9, 0xad, 0x2f,
+                       0x3a, 0xfe, 0x93, 0xb2, 0x81, 0x4f, 0x79, 0xf5,
+                       0x00, 0x0f, 0xfc, 0x03, 0x66, 0xc2, 0x51, 0xe6,
+               }) != 0 {
+                       t.FailNow()
+               }
        })
-       if bytes.Compare(h.Sum(nil), []byte{
-               0xa5, 0x9b, 0xab, 0x22, 0xec, 0xae, 0x19, 0xc6,
-               0x5f, 0xbd, 0xe6, 0xe5, 0xf4, 0xe9, 0xf5, 0xd8,
-               0x54, 0x9d, 0x31, 0xf0, 0x37, 0xf9, 0xdf, 0x9b,
-               0x90, 0x55, 0x00, 0xe1, 0x71, 0x92, 0x3a, 0x77,
-               0x3d, 0x5f, 0x15, 0x30, 0xf2, 0xed, 0x7e, 0x96,
-               0x4c, 0xb2, 0xee, 0xdc, 0x29, 0xe9, 0xad, 0x2f,
-               0x3a, 0xfe, 0x93, 0xb2, 0x81, 0x4f, 0x79, 0xf5,
-               0x00, 0x0f, 0xfc, 0x03, 0x66, 0xc2, 0x51, 0xe6,
-       }) != 0 {
-               t.FailNow()
-       }
 }