]> Cypherpunks repositories - gogost.git/commitdiff
Less t.Run separations
authorSergey Matveev <stargrave@stargrave.org>
Wed, 12 Feb 2025 09:42:57 +0000 (12:42 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 12 Feb 2025 09:42:57 +0000 (12:42 +0300)
gost34112012256/esptree_test.go
gost34112012256/hkdf_test.go
gost34112012512/pbkdf2_test.go
gost341194/hash_test.go
gost341194/pbkdf2_test.go
mgm/mode.go

index 7293f336f8c2478b9b45ad5722ced00ca4fda602..22220c02fe4f8faf10fbb535085bfa9b8f897555 100644 (file)
@@ -20,173 +20,178 @@ import (
        "testing"
 )
 
-func TestESPTree(t *testing.T) {
-       t.Run("1", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0xB6, 0x18, 0x0C, 0x14, 0x5C, 0x51, 0x2D, 0xBD,
-                       0x69, 0xD9, 0xCE, 0xA9, 0x2C, 0xAC, 0x1B, 0x5C,
-                       0xE1, 0xBC, 0xFA, 0x73, 0x79, 0x2D, 0x61, 0xAF,
-                       0x0B, 0x44, 0x0D, 0x84, 0xB5, 0x22, 0xCC, 0x38,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x2F, 0xF1, 0xC9, 0x0E, 0xDE, 0x78, 0x6E, 0x06,
-                       0x1E, 0x17, 0xB3, 0x74, 0xD7, 0x82, 0xAF, 0x7B,
-                       0xD8, 0x80, 0xBD, 0x52, 0x7C, 0x66, 0xA2, 0xBA,
-                       0xDC, 0x3E, 0x56, 0x9A, 0xAB, 0x27, 0x1D, 0xA4,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+func TestESPTree1(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0xB6, 0x18, 0x0C, 0x14, 0x5C, 0x51, 0x2D, 0xBD,
+               0x69, 0xD9, 0xCE, 0xA9, 0x2C, 0xAC, 0x1B, 0x5C,
+               0xE1, 0xBC, 0xFA, 0x73, 0x79, 0x2D, 0x61, 0xAF,
+               0x0B, 0x44, 0x0D, 0x84, 0xB5, 0x22, 0xCC, 0x38,
        })
-       t.Run("2", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0xB6, 0x18, 0x0C, 0x14, 0x5C, 0x51, 0x2D, 0xBD,
-                       0x69, 0xD9, 0xCE, 0xA9, 0x2C, 0xAC, 0x1B, 0x5C,
-                       0xE1, 0xBC, 0xFA, 0x73, 0x79, 0x2D, 0x61, 0xAF,
-                       0x0B, 0x44, 0x0D, 0x84, 0xB5, 0x22, 0xCC, 0x38,
-               })
-               is := []byte{0x00, 0x00, 0x01, 0x00, 0x01}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x9A, 0xBA, 0xC6, 0x57, 0x78, 0x18, 0x0E, 0x6F,
-                       0x2A, 0xF6, 0x1F, 0xB8, 0xD5, 0x71, 0x62, 0x36,
-                       0x66, 0xC2, 0xF5, 0x13, 0x0D, 0x54, 0xE2, 0x11,
-                       0x6C, 0x7D, 0x53, 0x0E, 0x6E, 0x7D, 0x48, 0xBC,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x2F, 0xF1, 0xC9, 0x0E, 0xDE, 0x78, 0x6E, 0x06,
+               0x1E, 0x17, 0xB3, 0x74, 0xD7, 0x82, 0xAF, 0x7B,
+               0xD8, 0x80, 0xBD, 0x52, 0x7C, 0x66, 0xA2, 0xBA,
+               0xDC, 0x3E, 0x56, 0x9A, 0xAB, 0x27, 0x1D, 0xA4,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree2(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0xB6, 0x18, 0x0C, 0x14, 0x5C, 0x51, 0x2D, 0xBD,
+               0x69, 0xD9, 0xCE, 0xA9, 0x2C, 0xAC, 0x1B, 0x5C,
+               0xE1, 0xBC, 0xFA, 0x73, 0x79, 0x2D, 0x61, 0xAF,
+               0x0B, 0x44, 0x0D, 0x84, 0xB5, 0x22, 0xCC, 0x38,
        })
-       t.Run("3", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0x5B, 0x50, 0xBF, 0x33, 0x78, 0x87, 0x02, 0x38,
-                       0xF3, 0xCA, 0x74, 0x0F, 0xD1, 0x24, 0xBA, 0x6C,
-                       0x22, 0x83, 0xEF, 0x58, 0x9B, 0xE6, 0xF4, 0x6A,
-                       0x89, 0x4A, 0xA3, 0x5D, 0x5F, 0x06, 0xB2, 0x03,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x25, 0x65, 0x21, 0xE2, 0x70, 0xB7, 0x4A, 0x16,
-                       0x4D, 0xFC, 0x26, 0xE6, 0xBF, 0x0C, 0xCA, 0x76,
-                       0x5E, 0x9D, 0x41, 0x02, 0x7D, 0x4B, 0x7B, 0x19,
-                       0x76, 0x2B, 0x1C, 0xC9, 0x01, 0xDC, 0xDE, 0x7F,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x01, 0x00, 0x01}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x9A, 0xBA, 0xC6, 0x57, 0x78, 0x18, 0x0E, 0x6F,
+               0x2A, 0xF6, 0x1F, 0xB8, 0xD5, 0x71, 0x62, 0x36,
+               0x66, 0xC2, 0xF5, 0x13, 0x0D, 0x54, 0xE2, 0x11,
+               0x6C, 0x7D, 0x53, 0x0E, 0x6E, 0x7D, 0x48, 0xBC,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree3(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0x5B, 0x50, 0xBF, 0x33, 0x78, 0x87, 0x02, 0x38,
+               0xF3, 0xCA, 0x74, 0x0F, 0xD1, 0x24, 0xBA, 0x6C,
+               0x22, 0x83, 0xEF, 0x58, 0x9B, 0xE6, 0xF4, 0x6A,
+               0x89, 0x4A, 0xA3, 0x5D, 0x5F, 0x06, 0xB2, 0x03,
        })
-       t.Run("4", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0x5B, 0x50, 0xBF, 0x33, 0x78, 0x87, 0x02, 0x38,
-                       0xF3, 0xCA, 0x74, 0x0F, 0xD1, 0x24, 0xBA, 0x6C,
-                       0x22, 0x83, 0xEF, 0x58, 0x9B, 0xE6, 0xF4, 0x6A,
-                       0x89, 0x4A, 0xA3, 0x5D, 0x5F, 0x06, 0xB2, 0x03,
-               })
-               is := []byte{0x00, 0x00, 0x01, 0x00, 0x01}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x20, 0xE0, 0x46, 0xD4, 0x09, 0x83, 0x9B, 0x23,
-                       0xF0, 0x66, 0xA5, 0x0A, 0x7A, 0x06, 0x5B, 0x4A,
-                       0x39, 0x24, 0x4F, 0x0E, 0x29, 0xEF, 0x1E, 0x6F,
-                       0x2E, 0x5D, 0x2E, 0x13, 0x55, 0xF5, 0xDA, 0x08,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x25, 0x65, 0x21, 0xE2, 0x70, 0xB7, 0x4A, 0x16,
+               0x4D, 0xFC, 0x26, 0xE6, 0xBF, 0x0C, 0xCA, 0x76,
+               0x5E, 0x9D, 0x41, 0x02, 0x7D, 0x4B, 0x7B, 0x19,
+               0x76, 0x2B, 0x1C, 0xC9, 0x01, 0xDC, 0xDE, 0x7F,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree4(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0x5B, 0x50, 0xBF, 0x33, 0x78, 0x87, 0x02, 0x38,
+               0xF3, 0xCA, 0x74, 0x0F, 0xD1, 0x24, 0xBA, 0x6C,
+               0x22, 0x83, 0xEF, 0x58, 0x9B, 0xE6, 0xF4, 0x6A,
+               0x89, 0x4A, 0xA3, 0x5D, 0x5F, 0x06, 0xB2, 0x03,
        })
-       t.Run("5", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0x98, 0xBD, 0x34, 0xCE, 0x3B, 0xE1, 0x9A, 0x34,
-                       0x65, 0xE4, 0x87, 0xC0, 0x06, 0x48, 0x83, 0xF4,
-                       0x88, 0xCC, 0x23, 0x92, 0x63, 0xDC, 0x32, 0x04,
-                       0x91, 0x9B, 0x64, 0x3F, 0xE7, 0x57, 0xB2, 0xBE,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x98, 0xF1, 0x03, 0x01, 0x81, 0x0A, 0x04, 0x1C,
-                       0xDA, 0xDD, 0xE1, 0xBD, 0x85, 0xA0, 0x8F, 0x21,
-                       0x8B, 0xAC, 0xB5, 0x7E, 0x00, 0x35, 0xE2, 0x22,
-                       0xC8, 0x31, 0xE3, 0xE4, 0xF0, 0xA2, 0x0C, 0x8F,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x01, 0x00, 0x01}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x20, 0xE0, 0x46, 0xD4, 0x09, 0x83, 0x9B, 0x23,
+               0xF0, 0x66, 0xA5, 0x0A, 0x7A, 0x06, 0x5B, 0x4A,
+               0x39, 0x24, 0x4F, 0x0E, 0x29, 0xEF, 0x1E, 0x6F,
+               0x2E, 0x5D, 0x2E, 0x13, 0x55, 0xF5, 0xDA, 0x08,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree5(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0x98, 0xBD, 0x34, 0xCE, 0x3B, 0xE1, 0x9A, 0x34,
+               0x65, 0xE4, 0x87, 0xC0, 0x06, 0x48, 0x83, 0xF4,
+               0x88, 0xCC, 0x23, 0x92, 0x63, 0xDC, 0x32, 0x04,
+               0x91, 0x9B, 0x64, 0x3F, 0xE7, 0x57, 0xB2, 0xBE,
        })
-       t.Run("6", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0x98, 0xBD, 0x34, 0xCE, 0x3B, 0xE1, 0x9A, 0x34,
-                       0x65, 0xE4, 0x87, 0xC0, 0x06, 0x48, 0x83, 0xF4,
-                       0x88, 0xCC, 0x23, 0x92, 0x63, 0xDC, 0x32, 0x04,
-                       0x91, 0x9B, 0x64, 0x3F, 0xE7, 0x57, 0xB2, 0xBE,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x01}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x02, 0xC5, 0x41, 0x87, 0x7C, 0xC6, 0x23, 0xF3,
-                       0xF1, 0x35, 0x91, 0x9A, 0x75, 0x13, 0xB6, 0xF8,
-                       0xA8, 0xA1, 0x8C, 0xB2, 0x63, 0x99, 0x86, 0x2F,
-                       0x50, 0x81, 0x4F, 0x52, 0x91, 0x01, 0x67, 0x84,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x98, 0xF1, 0x03, 0x01, 0x81, 0x0A, 0x04, 0x1C,
+               0xDA, 0xDD, 0xE1, 0xBD, 0x85, 0xA0, 0x8F, 0x21,
+               0x8B, 0xAC, 0xB5, 0x7E, 0x00, 0x35, 0xE2, 0x22,
+               0xC8, 0x31, 0xE3, 0xE4, 0xF0, 0xA2, 0x0C, 0x8F,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree6(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0x98, 0xBD, 0x34, 0xCE, 0x3B, 0xE1, 0x9A, 0x34,
+               0x65, 0xE4, 0x87, 0xC0, 0x06, 0x48, 0x83, 0xF4,
+               0x88, 0xCC, 0x23, 0x92, 0x63, 0xDC, 0x32, 0x04,
+               0x91, 0x9B, 0x64, 0x3F, 0xE7, 0x57, 0xB2, 0xBE,
        })
-       t.Run("7", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0xD0, 0x65, 0xB5, 0x30, 0xFA, 0x20, 0xB8, 0x24,
-                       0xC7, 0x57, 0x0C, 0x1D, 0x86, 0x2A, 0xE3, 0x39,
-                       0x2C, 0x1C, 0x07, 0x6D, 0xFA, 0xDA, 0x69, 0x75,
-                       0x74, 0x4A, 0x07, 0xA8, 0x85, 0x7D, 0xBD, 0x30,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0x4C, 0x61, 0x45, 0x99, 0xA0, 0xA0, 0x67, 0xF1,
-                       0x94, 0x87, 0x24, 0x0A, 0xE1, 0x00, 0xE1, 0xB7,
-                       0xEA, 0xF2, 0x3E, 0xDA, 0xF8, 0x7E, 0x38, 0x73,
-                       0x50, 0x86, 0x1C, 0x68, 0x3B, 0xA4, 0x04, 0x46,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x01}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x02, 0xC5, 0x41, 0x87, 0x7C, 0xC6, 0x23, 0xF3,
+               0xF1, 0x35, 0x91, 0x9A, 0x75, 0x13, 0xB6, 0xF8,
+               0xA8, 0xA1, 0x8C, 0xB2, 0x63, 0x99, 0x86, 0x2F,
+               0x50, 0x81, 0x4F, 0x52, 0x91, 0x01, 0x67, 0x84,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree7(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0xD0, 0x65, 0xB5, 0x30, 0xFA, 0x20, 0xB8, 0x24,
+               0xC7, 0x57, 0x0C, 0x1D, 0x86, 0x2A, 0xE3, 0x39,
+               0x2C, 0x1C, 0x07, 0x6D, 0xFA, 0xDA, 0x69, 0x75,
+               0x74, 0x4A, 0x07, 0xA8, 0x85, 0x7D, 0xBD, 0x30,
        })
-       t.Run("8", func(t *testing.T) {
-               espTree := NewESPTree([]byte{
-                       0xD0, 0x65, 0xB5, 0x30, 0xFA, 0x20, 0xB8, 0x24,
-                       0xC7, 0x57, 0x0C, 0x1D, 0x86, 0x2A, 0xE3, 0x39,
-                       0x2C, 0x1C, 0x07, 0x6D, 0xFA, 0xDA, 0x69, 0x75,
-                       0x74, 0x4A, 0x07, 0xA8, 0x85, 0x7D, 0xBD, 0x30,
-               })
-               is := []byte{0x00, 0x00, 0x00, 0x00, 0x01}
-               got := espTree.Derive(is)
-               if !bytes.Equal(got, []byte{
-                       0xB4, 0xF3, 0xF9, 0x0D, 0xC4, 0x87, 0xFA, 0xB8,
-                       0xC4, 0xAF, 0xD0, 0xEB, 0x45, 0x49, 0xF2, 0xF0,
-                       0xE4, 0x36, 0x32, 0xB6, 0x79, 0x19, 0x37, 0x2E,
-                       0x1E, 0x96, 0x09, 0xEA, 0xF0, 0xB8, 0xE2, 0x28,
-               }) {
-                       t.FailNow()
-               }
-               if _, cached := espTree.DeriveCached(is); !cached {
-                       t.FailNow()
-               }
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x00}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0x4C, 0x61, 0x45, 0x99, 0xA0, 0xA0, 0x67, 0xF1,
+               0x94, 0x87, 0x24, 0x0A, 0xE1, 0x00, 0xE1, 0xB7,
+               0xEA, 0xF2, 0x3E, 0xDA, 0xF8, 0x7E, 0x38, 0x73,
+               0x50, 0x86, 0x1C, 0x68, 0x3B, 0xA4, 0x04, 0x46,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
+}
+
+func TestESPTree8(t *testing.T) {
+       espTree := NewESPTree([]byte{
+               0xD0, 0x65, 0xB5, 0x30, 0xFA, 0x20, 0xB8, 0x24,
+               0xC7, 0x57, 0x0C, 0x1D, 0x86, 0x2A, 0xE3, 0x39,
+               0x2C, 0x1C, 0x07, 0x6D, 0xFA, 0xDA, 0x69, 0x75,
+               0x74, 0x4A, 0x07, 0xA8, 0x85, 0x7D, 0xBD, 0x30,
        })
+       is := []byte{0x00, 0x00, 0x00, 0x00, 0x01}
+       got := espTree.Derive(is)
+       if !bytes.Equal(got, []byte{
+               0xB4, 0xF3, 0xF9, 0x0D, 0xC4, 0x87, 0xFA, 0xB8,
+               0xC4, 0xAF, 0xD0, 0xEB, 0x45, 0x49, 0xF2, 0xF0,
+               0xE4, 0x36, 0x32, 0xB6, 0x79, 0x19, 0x37, 0x2E,
+               0x1E, 0x96, 0x09, 0xEA, 0xF0, 0xB8, 0xE2, 0x28,
+       }) {
+               t.FailNow()
+       }
+       if _, cached := espTree.DeriveCached(is); !cached {
+               t.FailNow()
+       }
 }
index 106f63b6f3e2ba2c8ba8a2207480d8c7aa6feb6d..61af7ecd0581344b82cfa06e11c5acc6b0b681f4 100644 (file)
@@ -17,152 +17,151 @@ package gost34112012256
 
 import (
        "bytes"
-       "testing"
-
        "crypto/hkdf"
+       "testing"
 )
 
-func TestHKDF(t *testing.T) {
-       t.Run("1", func(t *testing.T) {
-               ikm := []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-               }
-               salt := []byte{
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c,
-               }
-               prk, err := hkdf.Extract(New, ikm, salt)
-               if err != nil {
-                       t.Fatal(err)
-               }
-               if !bytes.Equal(prk, []byte{
-                       0x94, 0x7d, 0x3d, 0x99, 0x2e, 0xdc, 0x44, 0xe3,
-                       0x7b, 0x32, 0x72, 0x40, 0xf1, 0x5e, 0x62, 0x91,
-                       0x3c, 0x0b, 0x91, 0xcc, 0x3e, 0x21, 0x43, 0xff,
-                       0xe7, 0x72, 0x43, 0x6e, 0xc6, 0x3c, 0x99, 0xed,
-               }) {
-                       t.Fatal("PRK differs")
-               }
-               info := []byte{0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9}
-               okm, err := hkdf.Expand(New, prk, string(info), 42)
-               if err != nil {
-                       t.Fatal("HKDF-Expand failed")
-               }
-               if !bytes.Equal(okm, []byte{
-                       0x35, 0xf8, 0xf8, 0x03, 0x7a, 0xad, 0xf7, 0xaf,
-                       0x3e, 0x4f, 0xc7, 0xbc, 0x8b, 0x93, 0xa9, 0x27,
-                       0xd6, 0x85, 0xd4, 0x2f, 0x66, 0x28, 0xf9, 0xe6,
-                       0x23, 0xc8, 0x5e, 0x19, 0x70, 0x09, 0x69, 0x2e,
-                       0xae, 0xb1, 0x0b, 0x25, 0x26, 0x71, 0x2a, 0x7b,
-                       0x49, 0xb7,
-               }) {
-                       t.Fatal("OKM differs")
-               }
-       })
-       t.Run("2", func(t *testing.T) {
-               ikm := []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,
-                       0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-                       0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-                       0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-                       0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-                       0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-                       0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-               }
-               salt := []byte{
-                       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-                       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                       0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-                       0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-                       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-                       0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-                       0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-                       0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-                       0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-                       0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-               }
-               prk, err := hkdf.Extract(New, ikm, salt)
-               if err != nil {
-                       t.Fatal(err)
-               }
-               if !bytes.Equal(prk, []byte{
-                       0xa2, 0xff, 0xcd, 0x64, 0x44, 0x45, 0xef, 0x94,
-                       0x7e, 0x7e, 0xc9, 0xa8, 0x26, 0x89, 0x3d, 0x9a,
-                       0x91, 0xfc, 0xe2, 0x65, 0xb0, 0xc2, 0xa9, 0x59,
-                       0x6c, 0x59, 0xe1, 0x41, 0x53, 0x1d, 0x90, 0x77,
-               }) {
-                       t.Fatal("PRK differs")
-               }
-               info := []byte{
-                       0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-                       0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-                       0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-                       0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-                       0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-                       0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-                       0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-                       0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-                       0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-                       0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-               }
-               okm, err := hkdf.Expand(New, prk, string(info), 82)
-               if err != nil {
-                       t.Fatal("HKDF-Expand failed")
-               }
-               if !bytes.Equal(okm, []byte{
-                       0x28, 0x8c, 0x27, 0xff, 0xda, 0xf6, 0x4b, 0xe8,
-                       0x24, 0xde, 0x84, 0x93, 0x48, 0x9d, 0x03, 0x12,
-                       0x28, 0x07, 0xe9, 0x24, 0xaa, 0x6a, 0x09, 0x27,
-                       0x01, 0x16, 0x9d, 0x2f, 0x66, 0x38, 0xc9, 0xd5,
-                       0xc2, 0xbf, 0x09, 0xdb, 0x9f, 0xbe, 0x0b, 0x32,
-                       0x88, 0x59, 0x7b, 0x67, 0x1d, 0xaf, 0x17, 0xed,
-                       0x3e, 0x7d, 0xa5, 0x89, 0xdf, 0x69, 0xcc, 0x1d,
-                       0xdc, 0xd8, 0x26, 0x2c, 0x1c, 0x6b, 0xe1, 0x4b,
-                       0xc0, 0xb8, 0x5c, 0x4c, 0x2b, 0x24, 0xb6, 0xd8,
-                       0xb4, 0x38, 0x18, 0xa1, 0xa5, 0xb0, 0x67, 0x53,
-                       0xaf, 0x72,
-               }) {
-                       t.Fatal("OKM differs")
-               }
-       })
-       t.Run("3", func(t *testing.T) {
-               ikm := []byte{
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-               }
-               salt := []byte{}
-               prk, err := hkdf.Extract(New, ikm, salt)
-               if err != nil {
-                       t.Fatal(err)
-               }
-               if !bytes.Equal(prk, []byte{
-                       0x1f, 0xfc, 0x6d, 0x2b, 0xf9, 0x59, 0x4d, 0xfd,
-                       0xf7, 0x75, 0xc2, 0xc1, 0x8f, 0xa3, 0xae, 0xcc,
-                       0x92, 0xb6, 0xf9, 0xbc, 0x5c, 0xff, 0x0e, 0x08,
-                       0x6f, 0x34, 0x0f, 0xab, 0x33, 0x6d, 0x86, 0x5f,
-               }) {
-                       t.Fatal("PRK differs")
-               }
-               info := []byte{}
-               okm, err := hkdf.Expand(New, prk, string(info), 42)
-               if err != nil {
-                       t.Fatal("HKDF-Expand failed")
-               }
-               if !bytes.Equal(okm, []byte{
-                       0x6a, 0xad, 0xb1, 0xa6, 0x48, 0x96, 0x2f, 0x0d,
-                       0x96, 0x19, 0xcc, 0xdb, 0xf9, 0xd9, 0x2d, 0xc3,
-                       0x54, 0x79, 0x73, 0x73, 0x3b, 0xc4, 0x06, 0x1d,
-                       0x9f, 0xa5, 0x3e, 0xa8, 0x2a, 0x17, 0x35, 0xd7,
-                       0xf3, 0xa4, 0x84, 0x6c, 0x76, 0xf9, 0x94, 0xb5,
-                       0xdd, 0x03,
-               }) {
-                       t.Fatal("OKM differs")
-               }
-       })
+func TestHKDF1(t *testing.T) {
+       ikm := []byte{
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+       }
+       salt := []byte{
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x08, 0x09, 0x0a, 0x0b, 0x0c,
+       }
+       prk, err := hkdf.Extract(New, ikm, salt)
+       if err != nil {
+               t.Fatal(err)
+       }
+       if !bytes.Equal(prk, []byte{
+               0x94, 0x7d, 0x3d, 0x99, 0x2e, 0xdc, 0x44, 0xe3,
+               0x7b, 0x32, 0x72, 0x40, 0xf1, 0x5e, 0x62, 0x91,
+               0x3c, 0x0b, 0x91, 0xcc, 0x3e, 0x21, 0x43, 0xff,
+               0xe7, 0x72, 0x43, 0x6e, 0xc6, 0x3c, 0x99, 0xed,
+       }) {
+               t.Fatal("PRK differs")
+       }
+       info := []byte{0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9}
+       okm, err := hkdf.Expand(New, prk, string(info), 42)
+       if err != nil {
+               t.Fatal("HKDF-Expand failed")
+       }
+       if !bytes.Equal(okm, []byte{
+               0x35, 0xf8, 0xf8, 0x03, 0x7a, 0xad, 0xf7, 0xaf,
+               0x3e, 0x4f, 0xc7, 0xbc, 0x8b, 0x93, 0xa9, 0x27,
+               0xd6, 0x85, 0xd4, 0x2f, 0x66, 0x28, 0xf9, 0xe6,
+               0x23, 0xc8, 0x5e, 0x19, 0x70, 0x09, 0x69, 0x2e,
+               0xae, 0xb1, 0x0b, 0x25, 0x26, 0x71, 0x2a, 0x7b,
+               0x49, 0xb7,
+       }) {
+               t.Fatal("OKM differs")
+       }
+}
+
+func TestHKDF2(t *testing.T) {
+       ikm := []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,
+               0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+               0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+               0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+               0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+               0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+               0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+       }
+       salt := []byte{
+               0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+               0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+               0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+               0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+               0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+               0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+               0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+               0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+               0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+               0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+       }
+       prk, err := hkdf.Extract(New, ikm, salt)
+       if err != nil {
+               t.Fatal(err)
+       }
+       if !bytes.Equal(prk, []byte{
+               0xa2, 0xff, 0xcd, 0x64, 0x44, 0x45, 0xef, 0x94,
+               0x7e, 0x7e, 0xc9, 0xa8, 0x26, 0x89, 0x3d, 0x9a,
+               0x91, 0xfc, 0xe2, 0x65, 0xb0, 0xc2, 0xa9, 0x59,
+               0x6c, 0x59, 0xe1, 0x41, 0x53, 0x1d, 0x90, 0x77,
+       }) {
+               t.Fatal("PRK differs")
+       }
+       info := []byte{
+               0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+               0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+               0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+               0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+               0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+               0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+               0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+               0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+               0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+               0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+       }
+       okm, err := hkdf.Expand(New, prk, string(info), 82)
+       if err != nil {
+               t.Fatal("HKDF-Expand failed")
+       }
+       if !bytes.Equal(okm, []byte{
+               0x28, 0x8c, 0x27, 0xff, 0xda, 0xf6, 0x4b, 0xe8,
+               0x24, 0xde, 0x84, 0x93, 0x48, 0x9d, 0x03, 0x12,
+               0x28, 0x07, 0xe9, 0x24, 0xaa, 0x6a, 0x09, 0x27,
+               0x01, 0x16, 0x9d, 0x2f, 0x66, 0x38, 0xc9, 0xd5,
+               0xc2, 0xbf, 0x09, 0xdb, 0x9f, 0xbe, 0x0b, 0x32,
+               0x88, 0x59, 0x7b, 0x67, 0x1d, 0xaf, 0x17, 0xed,
+               0x3e, 0x7d, 0xa5, 0x89, 0xdf, 0x69, 0xcc, 0x1d,
+               0xdc, 0xd8, 0x26, 0x2c, 0x1c, 0x6b, 0xe1, 0x4b,
+               0xc0, 0xb8, 0x5c, 0x4c, 0x2b, 0x24, 0xb6, 0xd8,
+               0xb4, 0x38, 0x18, 0xa1, 0xa5, 0xb0, 0x67, 0x53,
+               0xaf, 0x72,
+       }) {
+               t.Fatal("OKM differs")
+       }
+}
+
+func TestHKDF3(t *testing.T) {
+       ikm := []byte{
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+       }
+       salt := []byte{}
+       prk, err := hkdf.Extract(New, ikm, salt)
+       if err != nil {
+               t.Fatal(err)
+       }
+       if !bytes.Equal(prk, []byte{
+               0x1f, 0xfc, 0x6d, 0x2b, 0xf9, 0x59, 0x4d, 0xfd,
+               0xf7, 0x75, 0xc2, 0xc1, 0x8f, 0xa3, 0xae, 0xcc,
+               0x92, 0xb6, 0xf9, 0xbc, 0x5c, 0xff, 0x0e, 0x08,
+               0x6f, 0x34, 0x0f, 0xab, 0x33, 0x6d, 0x86, 0x5f,
+       }) {
+               t.Fatal("PRK differs")
+       }
+       info := []byte{}
+       okm, err := hkdf.Expand(New, prk, string(info), 42)
+       if err != nil {
+               t.Fatal("HKDF-Expand failed")
+       }
+       if !bytes.Equal(okm, []byte{
+               0x6a, 0xad, 0xb1, 0xa6, 0x48, 0x96, 0x2f, 0x0d,
+               0x96, 0x19, 0xcc, 0xdb, 0xf9, 0xd9, 0x2d, 0xc3,
+               0x54, 0x79, 0x73, 0x73, 0x3b, 0xc4, 0x06, 0x1d,
+               0x9f, 0xa5, 0x3e, 0xa8, 0x2a, 0x17, 0x35, 0xd7,
+               0xf3, 0xa4, 0x84, 0x6c, 0x76, 0xf9, 0x94, 0xb5,
+               0xdd, 0x03,
+       }) {
+               t.Fatal("OKM differs")
+       }
 }
index 741def4f9f45ca62194eba7ff95d674f88e8eb33..e989de18b6db4624a819bf5d735c2967137590ad 100644 (file)
@@ -17,9 +17,8 @@ package gost34112012512
 
 import (
        "bytes"
-       "testing"
-
        "crypto/pbkdf2"
+       "testing"
 )
 
 // Test vectors from http://tc26.ru/.../R_50.1.111-2016.pdf
index 19898139264067123f2bb811ea70a4c77d63bb83..f86d54ce967afbd842e3f768478dc7ed7d173531 100644 (file)
@@ -30,233 +30,227 @@ func TestHashInterface(t *testing.T) {
        var _ hash.Hash = h
 }
 
-func TestVectors(t *testing.T) {
+func TestVectorsEmpty(t *testing.T) {
        h := New(SboxDefault)
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("empty", func(t *testing.T) {
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
-
-       t.Run("a", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("a"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsA(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("a"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("abc", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("abc"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsABC(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("abc"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("message digest", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("message digest"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsMessageDigest(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("message digest"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("128U", func(t *testing.T) {
-               h.Reset()
-               for i := 0; i < 128; i++ {
-                       h.Write([]byte("U"))
-               }
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectors128U(t *testing.T) {
+       h := New(SboxDefault)
+       for i := 0; i < 128; i++ {
+               h.Write([]byte("U"))
+       }
+       if !bytes.Equal(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,
+       }) {
+               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.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsLazyDog(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("The quick brown fox jumps over the lazy dog"))
+       if !bytes.Equal(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,
+       }) {
+               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.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsLazyCog(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("The quick brown fox jumps over the lazy cog"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("32", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("This is message, length=32 bytes"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectors32(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("This is message, length=32 bytes"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("50", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("Suppose the original message has length = 50 bytes"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectors50(t *testing.T) {
+       h := New(SboxDefault)
+       h.Write([]byte("Suppose the original message has length = 50 bytes"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
 }
 
-func TestVectorsCryptoPro(t *testing.T) {
+func TestVectorsCryptoProEmpty(t *testing.T) {
        h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("empty", func(t *testing.T) {
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
-
-       t.Run("a", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("a"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoProA(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("a"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("abc", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("abc"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoProABC(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("abc"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("message digest", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("message digest"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoProMessageDigest(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("message digest"))
+       if !bytes.Equal(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,
+       }) {
+               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.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoProLazyDog(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("The quick brown fox jumps over the lazy dog"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("32", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("This is message, length=32 bytes"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoPro32(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("This is message, length=32 bytes"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("50", func(t *testing.T) {
-               h.Reset()
-               h.Write([]byte("Suppose the original message has length = 50 bytes"))
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoPro50(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       h.Write([]byte("Suppose the original message has length = 50 bytes"))
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
+}
 
-       t.Run("128U", func(t *testing.T) {
-               h.Reset()
-               for i := 0; i < 128; i++ {
-                       h.Write([]byte{'U'})
-               }
-               if !bytes.Equal(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,
-               }) {
-                       t.FailNow()
-               }
-       })
+func TestVectorsCryptoPro128U(t *testing.T) {
+       h := New(&gost28147.SboxIdGostR341194CryptoProParamSet)
+       for i := 0; i < 128; i++ {
+               h.Write([]byte{'U'})
+       }
+       if !bytes.Equal(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,
+       }) {
+               t.FailNow()
+       }
 }
 
 func TestRandom(t *testing.T) {
index 39a747f85da01870fdc9b0409fc02d92f9dd2f82..ad60f8fa4c65a66086587a50ccdb9f9afb0063f4 100644 (file)
@@ -17,11 +17,10 @@ package gost341194
 
 import (
        "bytes"
+       "crypto/pbkdf2"
        "hash"
        "testing"
 
-       "crypto/pbkdf2"
-
        "go.cypherpunks.su/gogost/v6/gost28147"
 )
 
index 73f0c330021339eb24d45881c18648017ac91093..e0aee47a96badc74d557211806237e46741a8a0a 100644 (file)
@@ -174,7 +174,7 @@ func (mgm *MGM) crypt(out, in []byte) {
        for len(in) >= mgm.BlockSize {
                mgm.cipher.Encrypt(mgm.bufC, mgm.bufP) // E_K(Y_i)
                // subtle.XORBytes panic because of partial buffer overlapping
-               for i := 0; i < mgm.BlockSize; i++ {   // C_i = P_i (xor) E_K(Y_i)
+               for i := 0; i < mgm.BlockSize; i++ { // C_i = P_i (xor) E_K(Y_i)
                        out[i] = mgm.bufC[i] ^ in[i]
                }
                incr(mgm.bufP[mgm.BlockSize/2:]) // Y_i = incr_r(Y_{i-1})