Bug 853285: Fix AES GCM tests. TBR=rrelyea.

1. Actually run the AES CTS, CTR, GCM, and DSA-2 tests.
2. Fix the errors in Test Case 7.
3. Generate the test files for test cases 1, 7, and 13.
This requires renumbering many of the existing test files.
4. Add Bob's hex.c program, which is needed to convert the
test source test<n>.txt to the test files.

95 files changed, 434 insertions, 353 deletions

diff --git a/cmd/bltest/tests/aes_gcm/aad0 b/cmd/bltest/tests/aes_gcm/aad0
deleted file mode 100644
index e69de29bb..000000000
--- a/cmd/bltest/tests/aes_gcm/aad0
+++ /dev/null
diff --git a/cmd/bltest/tests/aes_gcm/aad10 b/cmd/bltest/tests/aes_gcm/aad10
index e69de29bb..87b29d32c 100644
--- a/cmd/bltest/tests/aes_gcm/aad10
+++ b/cmd/bltest/tests/aes_gcm/aad10
@@ -0,0 +1 @@
+þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad11 b/cmd/bltest/tests/aes_gcm/aad11
index e69de29bb..87b29d32c 100644
--- a/cmd/bltest/tests/aes_gcm/aad11
+++ b/cmd/bltest/tests/aes_gcm/aad11
@@ -0,0 +1 @@
+þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad13 b/cmd/bltest/tests/aes_gcm/aad13
index 87b29d32c..e69de29bb 100644
--- a/cmd/bltest/tests/aes_gcm/aad13
+++ b/cmd/bltest/tests/aes_gcm/aad13
@@ -1 +0,0 @@
-þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad14 b/cmd/bltest/tests/aes_gcm/aad14
index 87b29d32c..e69de29bb 100644
--- a/cmd/bltest/tests/aes_gcm/aad14
+++ b/cmd/bltest/tests/aes_gcm/aad14
@@ -1 +0,0 @@
-þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad12 b/cmd/bltest/tests/aes_gcm/aad15
index 87b29d32c..87b29d32c 100644
--- a/cmd/bltest/tests/aes_gcm/aad12
+++ b/cmd/bltest/tests/aes_gcm/aad15
diff --git a/cmd/bltest/tests/aes_gcm/aad16 b/cmd/bltest/tests/aes_gcm/aad16
new file mode 100644
index 000000000..87b29d32c
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/aad16
@@ -0,0 +1 @@
+þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad17 b/cmd/bltest/tests/aes_gcm/aad17
new file mode 100644
index 000000000..87b29d32c
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/aad17
@@ -0,0 +1 @@
+þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad2 b/cmd/bltest/tests/aes_gcm/aad2
index 87b29d32c..e69de29bb 100644
--- a/cmd/bltest/tests/aes_gcm/aad2
+++ b/cmd/bltest/tests/aes_gcm/aad2
@@ -1 +0,0 @@
-þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad5 b/cmd/bltest/tests/aes_gcm/aad5
index e69de29bb..87b29d32c 100644
--- a/cmd/bltest/tests/aes_gcm/aad5
+++ b/cmd/bltest/tests/aes_gcm/aad5
@@ -0,0 +1 @@
+þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad6 b/cmd/bltest/tests/aes_gcm/aad6
deleted file mode 100644
index e69de29bb..000000000
--- a/cmd/bltest/tests/aes_gcm/aad6
+++ /dev/null
diff --git a/cmd/bltest/tests/aes_gcm/aad7 b/cmd/bltest/tests/aes_gcm/aad7
index 87b29d32c..e69de29bb 100644
--- a/cmd/bltest/tests/aes_gcm/aad7
+++ b/cmd/bltest/tests/aes_gcm/aad7
@@ -1 +0,0 @@
-þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/aad8 b/cmd/bltest/tests/aes_gcm/aad8
index 87b29d32c..e69de29bb 100644
--- a/cmd/bltest/tests/aes_gcm/aad8
+++ b/cmd/bltest/tests/aes_gcm/aad8
@@ -1 +0,0 @@
-þíúÎÞ­¾ïþíúÎÞ­¾ï«­ÚÒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/ciphertext0 b/cmd/bltest/tests/aes_gcm/ciphertext0
deleted file mode 100644
index 9913ff1fa..000000000
--- a/cmd/bltest/tests/aes_gcm/ciphertext0
+++ /dev/null
@@ -1 +0,0 @@
-A4jazmC2o5LzKMK5cbL+eKtuR9Qs7BO99TpnshJXvd8=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext1 b/cmd/bltest/tests/aes_gcm/ciphertext1
index f5efb3d52..9913ff1fa 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext1
+++ b/cmd/bltest/tests/aes_gcm/ciphertext1
@@ -1,2 +1 @@
-QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF

-G6MLOWoKrJc9WOCRRz9ZhU1cKvMnzWSmLPNavSum+rQ=

+A4jazmC2o5LzKMK5cbL+eKtuR9Qs7BO99TpnshJXvd8=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext10 b/cmd/bltest/tests/aes_gcm/ciphertext10
index 15bc5e17f..70cb47100 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext10
+++ b/cmd/bltest/tests/aes_gcm/ciphertext10
@@ -1 +1,2 @@
-zqdAPU1ga24HTsXTuvOdGNDRyKeZmWvwJluYtdSKuRk=

+DxD1ma4UoVTtJLNuJTJNuMVmYy7yu7NPg0coD8RQcFf93CnfmkcfdcZlQdTU2tHJ

+6ToZpY6LRz+g8GL3ZdzFf89iOiQJT8ykDTUz+A==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext11 b/cmd/bltest/tests/aes_gcm/ciphertext11
index a982ef2fe..b9c42364e 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext11
+++ b/cmd/bltest/tests/aes_gcm/ciphertext11
@@ -1,2 +1,2 @@
-Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4

-xfYeY5O6egq8yfZiiYAVrbCU2sXZNHG97BpQInDjzGw=

+0n6IaBzjJDxIMBZaj9z5/x3podjmtEfvbve3mChmbkWB55ASrzTd2eLwN1ibKS2z

+5nwDZ0X6Iufptzc73PVm/ykcJbu4Vo/D03am2Q==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext13 b/cmd/bltest/tests/aes_gcm/ciphertext13
index 86d9096bd..15bc5e17f 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext13
+++ b/cmd/bltest/tests/aes_gcm/ciphertext13
@@ -1,2 +1 @@
-w3Yt8cp4fTKuR8E78ZhEy68a4U0Ll2r6xS/315u6neD+tYLTOTSk8JVMwjY7xz94

-YqxDDmSr5Jn0fJsfOjN9v0anksReRUkT/i6o8g==

+zqdAPU1ga24HTsXTuvOdGNDRyKeZmWvwJluYtdSKuRk=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext14 b/cmd/bltest/tests/aes_gcm/ciphertext14
index 6be2346bf..a982ef2fe 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext14
+++ b/cmd/bltest/tests/aes_gcm/ciphertext14
@@ -1,2 +1,2 @@
-Wo3vLwyeU/H3XXhTZZ4qIO6ysiqv3mQZoFirT290a/QPwMO3gPJERS2j6/HF2Cze

-okGJlyAO+C5Ern4/pEqCZu4cjrDItdTPWunxmg==

+Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4

+xfYeY5O6egq8yfZiiYAVrbCU2sXZNHG97BpQInDjzGw=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext12 b/cmd/bltest/tests/aes_gcm/ciphertext15
index 5f5b95261..5f5b95261 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext12
+++ b/cmd/bltest/tests/aes_gcm/ciphertext15
diff --git a/cmd/bltest/tests/aes_gcm/ciphertext16 b/cmd/bltest/tests/aes_gcm/ciphertext16
new file mode 100644
index 000000000..86d9096bd
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/ciphertext16
@@ -0,0 +1,2 @@
+w3Yt8cp4fTKuR8E78ZhEy68a4U0Ll2r6xS/315u6neD+tYLTOTSk8JVMwjY7xz94

+YqxDDmSr5Jn0fJsfOjN9v0anksReRUkT/i6o8g==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext17 b/cmd/bltest/tests/aes_gcm/ciphertext17
new file mode 100644
index 000000000..6be2346bf
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/ciphertext17
@@ -0,0 +1,2 @@
+Wo3vLwyeU/H3XXhTZZ4qIO6ysiqv3mQZoFirT290a/QPwMO3gPJERS2j6/HF2Cze

+okGJlyAO+C5Ern4/pEqCZu4cjrDItdTPWunxmg==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext2 b/cmd/bltest/tests/aes_gcm/ciphertext2
index 80fe95e85..f5efb3d52 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext2
+++ b/cmd/bltest/tests/aes_gcm/ciphertext2
@@ -1,2 +1,2 @@
 QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF

-G6MLOWoKrJc9WOCRW8lPvDIhpduU+ula5xIaRw==

+G6MLOWoKrJc9WOCRRz9ZhU1cKvMnzWSmLPNavSum+rQ=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext3 b/cmd/bltest/tests/aes_gcm/ciphertext3
index cbc0194aa..80fe95e85 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext3
+++ b/cmd/bltest/tests/aes_gcm/ciphertext3
@@ -1,2 +1,2 @@
-YTU7TCgGk0p3f/UfoipHVWmbKnFPzcb4N2bl+XtsdCNzgGkA5J8ksisJdUTUiWtC

-SYm14eusDwfCP0WYNhLS5547B4VWG+FKrKL8yw==

+QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF

+G6MLOWoKrJc9WOCRW8lPvDIhpduU+ula5xIaRw==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext4 b/cmd/bltest/tests/aes_gcm/ciphertext4
index 77127ff0e..cbc0194aa 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext4
+++ b/cmd/bltest/tests/aes_gcm/ciphertext4
@@ -1,2 +1,2 @@
-jOJJmGJWFbYDoDOsoT+4lL6REqXDohGouiYqPMp+LKcB5Kmk+6Q8kMzcsoHUjHxv

-1ih10qykFwNMNK7lYZzFrv/+C/pGKvQ8FpnQUA==

+YTU7TCgGk0p3f/UfoipHVWmbKnFPzcb4N2bl+XtsdCNzgGkA5J8ksisJdUTUiWtC

+SYm14eusDwfCP0WYNhLS5547B4VWG+FKrKL8yw==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext5 b/cmd/bltest/tests/aes_gcm/ciphertext5
index d405c82fe..77127ff0e 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext5
+++ b/cmd/bltest/tests/aes_gcm/ciphertext5
@@ -1 +1,2 @@
-mOckfAfw/kEcJn5DhLD2AC/1jYADOSerjvTUWHUU8Ps=

+jOJJmGJWFbYDoDOsoT+4lL6REqXDohGouiYqPMp+LKcB5Kmk+6Q8kMzcsoHUjHxv

+1ih10qykFwNMNK7lYZzFrv/+C/pGKvQ8FpnQUA==

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext6 b/cmd/bltest/tests/aes_gcm/ciphertext6
deleted file mode 100644
index 53738bbef..000000000
--- a/cmd/bltest/tests/aes_gcm/ciphertext6
+++ /dev/null
@@ -1,2 +0,0 @@
-OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H

-GOJEiy/jJNnM2icQrK3iVpkkp8hYcza/sRgCTbhnShQ=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext7 b/cmd/bltest/tests/aes_gcm/ciphertext7
index bde2785bc..d405c82fe 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext7
+++ b/cmd/bltest/tests/aes_gcm/ciphertext7
@@ -1,2 +1 @@
-OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H

-GOJEiy/jJNnM2icQJRlJjoDxR483ulW9bSdhjA==

+mOckfAfw/kEcJn5DhLD2AC/1jYADOSerjvTUWHUU8Ps=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext8 b/cmd/bltest/tests/aes_gcm/ciphertext8
index 70cb47100..53738bbef 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext8
+++ b/cmd/bltest/tests/aes_gcm/ciphertext8
@@ -1,2 +1,2 @@
-DxD1ma4UoVTtJLNuJTJNuMVmYy7yu7NPg0coD8RQcFf93CnfmkcfdcZlQdTU2tHJ

-6ToZpY6LRz+g8GL3ZdzFf89iOiQJT8ykDTUz+A==

+OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H

+GOJEiy/jJNnM2icQrK3iVpkkp8hYcza/sRgCTbhnShQ=

diff --git a/cmd/bltest/tests/aes_gcm/ciphertext9 b/cmd/bltest/tests/aes_gcm/ciphertext9
index b9c42364e..bde2785bc 100644
--- a/cmd/bltest/tests/aes_gcm/ciphertext9
+++ b/cmd/bltest/tests/aes_gcm/ciphertext9
@@ -1,2 +1,2 @@
-0n6IaBzjJDxIMBZaj9z5/x3podjmtEfvbve3mChmbkWB55ASrzTd2eLwN1ibKS2z

-5nwDZ0X6Iufptzc73PVm/ykcJbu4Vo/D03am2Q==

+OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H

+GOJEiy/jJNnM2icQJRlJjoDxR483ulW9bSdhjA==

diff --git a/cmd/bltest/tests/aes_gcm/hex.c b/cmd/bltest/tests/aes_gcm/hex.c
new file mode 100644
index 000000000..6ad285179
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/hex.c
@@ -0,0 +1,68 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int tohex(int c)
+{
+   if ((c >= '0') && (c <= '9')) {
+        return c - '0';
+   }
+   if ((c >= 'a') && (c <= 'f')) {
+        return c - 'a' + 10;
+   }
+   if ((c >= 'A') && (c <= 'F')) {
+        return c - 'A' + 10;
+   }
+   return 0;
+}
+
+int isspace(int c)
+{
+   if (c <= ' ') return 1;
+   if (c == '\n') return 1;
+   if (c == '\t') return 1;
+   if (c == ':') return 1;
+   if (c == ';') return 1;
+   if (c == ',') return 1;
+   return 0;
+}
+
+void verify_nibble(int nibble, int current)
+{
+   if (nibble != 0) {
+        fprintf(stderr,"count mismatch %d (nibbles=0x%x)\n",nibble,current);
+        fflush(stderr);
+   }
+}
+
+int main(int argc, char **argv)
+{
+   int c;
+   int current = 0;
+   int nibble = 0;
+   int skip = 0;
+
+   if (argv[1]) {
+        skip = atoi(argv[1]);
+   }
+
+#define NIBBLE_COUNT 2
+   while ((c=getchar()) != EOF) {
+      if (isspace(c)) {
+        verify_nibble(nibble,current);
+        continue;
+      }
+      if (skip) {
+        skip--;
+        continue;
+      }
+      current = current << 4 | tohex(c);
+      nibble++;
+      if (nibble == NIBBLE_COUNT) {
+        putchar(current);
+        nibble = 0;
+        current = 0;
+      }
+   }
+   return 0;
+}
diff --git a/cmd/bltest/tests/aes_gcm/iv0 b/cmd/bltest/tests/aes_gcm/iv0
deleted file mode 100644
index ce58bc9f8..000000000
--- a/cmd/bltest/tests/aes_gcm/iv0
+++ /dev/null
diff --git a/cmd/bltest/tests/aes_gcm/iv1 b/cmd/bltest/tests/aes_gcm/iv1
index e3728f726..ce58bc9f8 100644
--- a/cmd/bltest/tests/aes_gcm/iv1
+++ b/cmd/bltest/tests/aes_gcm/iv1
diff --git a/cmd/bltest/tests/aes_gcm/iv10 b/cmd/bltest/tests/aes_gcm/iv10
index ce58bc9f8..bad60b08b 100644
--- a/cmd/bltest/tests/aes_gcm/iv10
+++ b/cmd/bltest/tests/aes_gcm/iv10
diff --git a/cmd/bltest/tests/aes_gcm/iv11 b/cmd/bltest/tests/aes_gcm/iv11
index e3728f726..f446641db 100644
--- a/cmd/bltest/tests/aes_gcm/iv11
+++ b/cmd/bltest/tests/aes_gcm/iv11
@@ -1 +1 @@
-Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
+“"]ø„åU�œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv13 b/cmd/bltest/tests/aes_gcm/iv13
index bad60b08b..ce58bc9f8 100644
--- a/cmd/bltest/tests/aes_gcm/iv13
+++ b/cmd/bltest/tests/aes_gcm/iv13
diff --git a/cmd/bltest/tests/aes_gcm/iv14 b/cmd/bltest/tests/aes_gcm/iv14
index f446641db..e3728f726 100644
--- a/cmd/bltest/tests/aes_gcm/iv14
+++ b/cmd/bltest/tests/aes_gcm/iv14
@@ -1 +1 @@
-“"]ø„åU�œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
\ No newline at end of file
+Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv12 b/cmd/bltest/tests/aes_gcm/iv15
index e3728f726..e3728f726 100644
--- a/cmd/bltest/tests/aes_gcm/iv12
+++ b/cmd/bltest/tests/aes_gcm/iv15
diff --git a/cmd/bltest/tests/aes_gcm/iv16 b/cmd/bltest/tests/aes_gcm/iv16
new file mode 100644
index 000000000..bad60b08b
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/iv16
@@ -0,0 +1 @@
+Êþº¾úÎÛ­
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv17 b/cmd/bltest/tests/aes_gcm/iv17
new file mode 100644
index 000000000..f446641db
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/iv17
@@ -0,0 +1 @@
+“"]ø„åU�œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv3 b/cmd/bltest/tests/aes_gcm/iv3
index bad60b08b..e3728f726 100644
--- a/cmd/bltest/tests/aes_gcm/iv3
+++ b/cmd/bltest/tests/aes_gcm/iv3
@@ -1 +1 @@
-Êþº¾úÎÛ­
\ No newline at end of file
+Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv4 b/cmd/bltest/tests/aes_gcm/iv4
index f446641db..bad60b08b 100644
--- a/cmd/bltest/tests/aes_gcm/iv4
+++ b/cmd/bltest/tests/aes_gcm/iv4
@@ -1 +1 @@
-“"]ø„åU�œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
\ No newline at end of file
+Êþº¾úÎÛ­
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv5 b/cmd/bltest/tests/aes_gcm/iv5
index ce58bc9f8..f446641db 100644
--- a/cmd/bltest/tests/aes_gcm/iv5
+++ b/cmd/bltest/tests/aes_gcm/iv5
diff --git a/cmd/bltest/tests/aes_gcm/iv6 b/cmd/bltest/tests/aes_gcm/iv6
deleted file mode 100644
index e3728f726..000000000
--- a/cmd/bltest/tests/aes_gcm/iv6
+++ /dev/null
@@ -1 +0,0 @@
-Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv7 b/cmd/bltest/tests/aes_gcm/iv7
index e3728f726..ce58bc9f8 100644
--- a/cmd/bltest/tests/aes_gcm/iv7
+++ b/cmd/bltest/tests/aes_gcm/iv7
diff --git a/cmd/bltest/tests/aes_gcm/iv8 b/cmd/bltest/tests/aes_gcm/iv8
index bad60b08b..e3728f726 100644
--- a/cmd/bltest/tests/aes_gcm/iv8
+++ b/cmd/bltest/tests/aes_gcm/iv8
@@ -1 +1 @@
-Êþº¾úÎÛ­
\ No newline at end of file
+Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/iv9 b/cmd/bltest/tests/aes_gcm/iv9
index f446641db..e3728f726 100644
--- a/cmd/bltest/tests/aes_gcm/iv9
+++ b/cmd/bltest/tests/aes_gcm/iv9
@@ -1 +1 @@
-“"]ø„åU�œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
\ No newline at end of file
+Êþº¾úÎÛ­ÞÊøˆ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/key0 b/cmd/bltest/tests/aes_gcm/key0
deleted file mode 100644
index 01d633b27..000000000
--- a/cmd/bltest/tests/aes_gcm/key0
+++ /dev/null
diff --git a/cmd/bltest/tests/aes_gcm/key1 b/cmd/bltest/tests/aes_gcm/key1
index 767ebdace..01d633b27 100644
--- a/cmd/bltest/tests/aes_gcm/key1
+++ b/cmd/bltest/tests/aes_gcm/key1
diff --git a/cmd/bltest/tests/aes_gcm/key10 b/cmd/bltest/tests/aes_gcm/key10
index 4e4e49357..222b4b5a2 100644
--- a/cmd/bltest/tests/aes_gcm/key10
+++ b/cmd/bltest/tests/aes_gcm/key10
diff --git a/cmd/bltest/tests/aes_gcm/key11 b/cmd/bltest/tests/aes_gcm/key11
index 2163baf5a..222b4b5a2 100644
--- a/cmd/bltest/tests/aes_gcm/key11
+++ b/cmd/bltest/tests/aes_gcm/key11
@@ -1 +1 @@
-þÿé’†esmj�”g0ƒþÿé’†esmj�”g0ƒ
\ No newline at end of file
+þÿé’†esmj�”g0ƒþÿé’†es
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/key13 b/cmd/bltest/tests/aes_gcm/key13
index 2163baf5a..4e4e49357 100644
--- a/cmd/bltest/tests/aes_gcm/key13
+++ b/cmd/bltest/tests/aes_gcm/key13
diff --git a/cmd/bltest/tests/aes_gcm/key12 b/cmd/bltest/tests/aes_gcm/key15
index 2163baf5a..2163baf5a 100644
--- a/cmd/bltest/tests/aes_gcm/key12
+++ b/cmd/bltest/tests/aes_gcm/key15
diff --git a/cmd/bltest/tests/aes_gcm/key16 b/cmd/bltest/tests/aes_gcm/key16
new file mode 100644
index 000000000..2163baf5a
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/key16
@@ -0,0 +1 @@
+þÿé’†esmj�”g0ƒþÿé’†esmj�”g0ƒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/key17 b/cmd/bltest/tests/aes_gcm/key17
new file mode 100644
index 000000000..2163baf5a
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/key17
@@ -0,0 +1 @@
+þÿé’†esmj�”g0ƒþÿé’†esmj�”g0ƒ
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/key5 b/cmd/bltest/tests/aes_gcm/key5
index 4ac5fc6cf..767ebdace 100644
--- a/cmd/bltest/tests/aes_gcm/key5
+++ b/cmd/bltest/tests/aes_gcm/key5
diff --git a/cmd/bltest/tests/aes_gcm/key6 b/cmd/bltest/tests/aes_gcm/key6
deleted file mode 100644
index 222b4b5a2..000000000
--- a/cmd/bltest/tests/aes_gcm/key6
+++ /dev/null
@@ -1 +0,0 @@
-þÿé’†esmj�”g0ƒþÿé’†es
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/key7 b/cmd/bltest/tests/aes_gcm/key7
index 222b4b5a2..4ac5fc6cf 100644
--- a/cmd/bltest/tests/aes_gcm/key7
+++ b/cmd/bltest/tests/aes_gcm/key7
diff --git a/cmd/bltest/tests/aes_gcm/mktst.sh b/cmd/bltest/tests/aes_gcm/mktst.sh
index be9962330..a990f519c 100644
--- a/cmd/bltest/tests/aes_gcm/mktst.sh
+++ b/cmd/bltest/tests/aes_gcm/mktst.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
 do
     file="test$i.txt"
     grep K= $file | sed -e 's;K=;;' | hex > key$i
diff --git a/cmd/bltest/tests/aes_gcm/numtests b/cmd/bltest/tests/aes_gcm/numtests
index 60d3b2f4a..3c032078a 100644
--- a/cmd/bltest/tests/aes_gcm/numtests
+++ b/cmd/bltest/tests/aes_gcm/numtests
@@ -1 +1 @@
-15
+18
diff --git a/cmd/bltest/tests/aes_gcm/plaintext0 b/cmd/bltest/tests/aes_gcm/plaintext0
deleted file mode 100644
index 01d633b27..000000000
--- a/cmd/bltest/tests/aes_gcm/plaintext0
+++ /dev/null
diff --git a/cmd/bltest/tests/aes_gcm/plaintext1 b/cmd/bltest/tests/aes_gcm/plaintext1
index 664f6c9de..01d633b27 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext1
+++ b/cmd/bltest/tests/aes_gcm/plaintext1
diff --git a/cmd/bltest/tests/aes_gcm/plaintext10 b/cmd/bltest/tests/aes_gcm/plaintext10
index 01d633b27..00505877a 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext10
+++ b/cmd/bltest/tests/aes_gcm/plaintext10
diff --git a/cmd/bltest/tests/aes_gcm/plaintext11 b/cmd/bltest/tests/aes_gcm/plaintext11
index 664f6c9de..00505877a 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext11
+++ b/cmd/bltest/tests/aes_gcm/plaintext11
@@ -1 +1 @@
-Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
\ No newline at end of file
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext13 b/cmd/bltest/tests/aes_gcm/plaintext13
index 00505877a..01d633b27 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext13
+++ b/cmd/bltest/tests/aes_gcm/plaintext13
diff --git a/cmd/bltest/tests/aes_gcm/plaintext14 b/cmd/bltest/tests/aes_gcm/plaintext14
index 00505877a..664f6c9de 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext14
+++ b/cmd/bltest/tests/aes_gcm/plaintext14
@@ -1 +1 @@
-Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext12 b/cmd/bltest/tests/aes_gcm/plaintext15
index 00505877a..00505877a 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext12
+++ b/cmd/bltest/tests/aes_gcm/plaintext15
diff --git a/cmd/bltest/tests/aes_gcm/plaintext16 b/cmd/bltest/tests/aes_gcm/plaintext16
new file mode 100644
index 000000000..00505877a
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/plaintext16
@@ -0,0 +1 @@
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext17 b/cmd/bltest/tests/aes_gcm/plaintext17
new file mode 100644
index 000000000..00505877a
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/plaintext17
@@ -0,0 +1 @@
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext2 b/cmd/bltest/tests/aes_gcm/plaintext2
index 00505877a..664f6c9de 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext2
+++ b/cmd/bltest/tests/aes_gcm/plaintext2
@@ -1 +1 @@
-Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext5 b/cmd/bltest/tests/aes_gcm/plaintext5
index 01d633b27..00505877a 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext5
+++ b/cmd/bltest/tests/aes_gcm/plaintext5
diff --git a/cmd/bltest/tests/aes_gcm/plaintext6 b/cmd/bltest/tests/aes_gcm/plaintext6
deleted file mode 100644
index 664f6c9de..000000000
--- a/cmd/bltest/tests/aes_gcm/plaintext6
+++ /dev/null
@@ -1 +0,0 @@
-Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/plaintext7 b/cmd/bltest/tests/aes_gcm/plaintext7
index 00505877a..01d633b27 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext7
+++ b/cmd/bltest/tests/aes_gcm/plaintext7
diff --git a/cmd/bltest/tests/aes_gcm/plaintext8 b/cmd/bltest/tests/aes_gcm/plaintext8
index 00505877a..664f6c9de 100644
--- a/cmd/bltest/tests/aes_gcm/plaintext8
+++ b/cmd/bltest/tests/aes_gcm/plaintext8
@@ -1 +1 @@
-Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9
\ No newline at end of file
+Ù12%ø„å¥Y	ůõ&š†§©S4÷Ú.L0=Š1Šr<••h	S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
\ No newline at end of file
diff --git a/cmd/bltest/tests/aes_gcm/test0.txt b/cmd/bltest/tests/aes_gcm/test0.txt
deleted file mode 100644
index 7bb83ce8b..000000000
--- a/cmd/bltest/tests/aes_gcm/test0.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-test="Test Case 2"
-K=00000000000000000000000000000000
-P=00000000000000000000000000000000
-IV=000000000000000000000000
-H=66e94bd4ef8a2c3b884cfa59ca342b2e
-Y0=00000000000000000000000000000001
-E(K,Y0)=58e2fccefa7e3061367f1d57a4e7455a
-Y1=00000000000000000000000000000002
-E(K,Y1)=0388dace60b6a392f328c2b971b2fe78
-X1 5e2ec746917062882c85b0685353deb7
-len(A)||len(C)=00000000000000000000000000000080
-GHASH(H,A,C)=f38cbb1ad69223dcc3457ae5b6b0f885
-C=0388dace60b6a392f328c2b971b2fe78
-T=ab6e47d42cec13bdf53a67b21257bddf
diff --git a/cmd/bltest/tests/aes_gcm/test1.txt b/cmd/bltest/tests/aes_gcm/test1.txt
index 8e69bf678..7bb83ce8b 100644
--- a/cmd/bltest/tests/aes_gcm/test1.txt
+++ b/cmd/bltest/tests/aes_gcm/test1.txt
@@ -1,23 +1,14 @@
-test="Test Case 3"
-K=feffe9928665731c6d6a8f9467308308
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-IV=cafebabefacedbaddecaf888
-H=b83b533708bf535d0aa6e52980d53b78
-Y0=cafebabefacedbaddecaf88800000001
-E(K,Y0)=3247184b3c4f69a44dbcd22887bbb418
-Y1=cafebabefacedbaddecaf88800000002
-E(K,Y1)=9bb22ce7d9f372c1ee2b28722b25f206
-Y2=cafebabefacedbaddecaf88800000003
-E(K,Y2)=650d887c3936533a1b8d4e1ea39d2b5c
-Y3=cafebabefacedbaddecaf88800000004
-E(K,Y3)=3de91827c10e9a4f5240647ee5221f20
-Y4=cafebabefacedbaddecaf88800000005
-E(K,Y4)=aac9e6ccc0074ac0873b9ba85d908bd0
-X1=59ed3f2bb1a0aaa07c9f56c6a504647b
-X2=b714c9048389afd9f9bc5c1d4378e052
-X3=47400c6577b1ee8d8f40b2721e86ff10
-X4=4796cf49464704b5dd91f159bb1b7f95
-len(A)||len(C)=00000000000000000000000000000200
-GHASH(H,A,C)=7f1b32b81b820d02614f8895ac1d4eac
-C=42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985
-T=4d5c2af327cd64a62cf35abd2ba6fab4
+test="Test Case 2"
+K=00000000000000000000000000000000
+P=00000000000000000000000000000000
+IV=000000000000000000000000
+H=66e94bd4ef8a2c3b884cfa59ca342b2e
+Y0=00000000000000000000000000000001
+E(K,Y0)=58e2fccefa7e3061367f1d57a4e7455a
+Y1=00000000000000000000000000000002
+E(K,Y1)=0388dace60b6a392f328c2b971b2fe78
+X1 5e2ec746917062882c85b0685353deb7
+len(A)||len(C)=00000000000000000000000000000080
+GHASH(H,A,C)=f38cbb1ad69223dcc3457ae5b6b0f885
+C=0388dace60b6a392f328c2b971b2fe78
+T=ab6e47d42cec13bdf53a67b21257bddf
diff --git a/cmd/bltest/tests/aes_gcm/test10.txt b/cmd/bltest/tests/aes_gcm/test10.txt
index b589ba413..2a4a5a99e 100644
--- a/cmd/bltest/tests/aes_gcm/test10.txt
+++ b/cmd/bltest/tests/aes_gcm/test10.txt
@@ -1,14 +1,28 @@
-test="Test Case 14"
-K=0000000000000000000000000000000000000000000000000000000000000000
-P=00000000000000000000000000000000
-IV=000000000000000000000000
-H=dc95c078a2408989ad48a21492842087
-Y0=00000000000000000000000000000001
-E(K,Y0)=530f8afbc74536b9a963b4f1c4cb738b
-Y1=00000000000000000000000000000002
-E(K,Y1)=cea7403d4d606b6e074ec5d3baf39d18
-X1=fd6ab7586e556dba06d69cfe6223b262
-len(A)||len(C)=00000000000000000000000000000080
-GHASH(H,A,C)=83de425c5edc5d498f382c441041ca92
-C=cea7403d4d606b6e074ec5d3baf39d18
-T=d0d1c8a799996bf0265b98b5d48ab919
+test="Test Case 11"
+K=feffe9928665731c6d6a8f9467308308feffe9928665731c
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
+A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+IV=cafebabefacedbad
+H=466923ec9ae682214f2c082badb39249
+N1=9473c07b02544299cf007c42c5778218
+len({})||len(IV)=00000000000000000000000000000040
+Y0=a14378078d27258a6292737e1802ada5
+E(K,Y0)=7bb6d647c902427ce7cf26563a337371
+X1=f3bf7ba3e305aeb05ed0d2e4fe076666
+X2=20a51fa2302e9c01b87c48f2c3d91a56
+Y1=a14378078d27258a6292737e1802ada6
+E(K,Y1)=d621c7bc5690a7b1487dbaab8ac76b22
+Y2=a14378078d27258a6292737e1802ada7
+E(K,Y2)=43c1ca7de78f4495ad0b18324e61fa25
+Y3=a14378078d27258a6292737e1802ada8
+E(K,Y3)=e1e0254a0f2f1626e9aa4ff09d7c64ec
+Y4=a14378078d27258a6292737e1802ada9
+E(K,Y4)=5850f4502486a1681a9319ce7d0afa59
+X3=8bdedafd6ee8e529689de3a269b8240d
+X4=6607feb377b49c9ecdbc696344fe22d8
+X5=8a19570a06500ba9405fcece4a73fb48
+X6=8532826e63ce4a5b89b70fa28f8070fe
+len(A)||len(C)=00000000000000a000000000000001e0
+GHASH(H,A,C)=1e6a133806607858ee80eaf237064089
+C=0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7
+T=65dcc57fcf623a24094fcca40d3533f8
diff --git a/cmd/bltest/tests/aes_gcm/test11.txt b/cmd/bltest/tests/aes_gcm/test11.txt
index f650ea7c6..d46e6f91f 100644
--- a/cmd/bltest/tests/aes_gcm/test11.txt
+++ b/cmd/bltest/tests/aes_gcm/test11.txt
@@ -1,23 +1,31 @@
-test="Test Case 15"
-K=feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-IV=cafebabefacedbaddecaf888
-H=acbef20579b4b8ebce889bac8732dad7
-Y0=cafebabefacedbaddecaf88800000001
-E(K,Y0)=fd2caa16a5832e76aa132c1453eeda7e
-Y1=cafebabefacedbaddecaf88800000002
-E(K,Y1)=8b1cf3d561d27be251263e66857164e7
-Y2=cafebabefacedbaddecaf88800000003
-E(K,Y2)=e29d258faad137135bd49280af645bd8
-Y3=cafebabefacedbaddecaf88800000004
-E(K,Y3)=908c82ddcc65b26e887f85341f243d1d
-Y4=cafebabefacedbaddecaf88800000005
-E(K,Y4)=749cf39639b79c5d06aa8d5b932fc7f8
-X1=fcbefb78635d598eddaf982310670f35
-X2=29de812309d3116a6eff7ec844484f3e
-X3=45fad9deeda9ea561b8f199c3613845b
-X4=ed95f8e164bf3213febc740f0bd9c6af
-len(A)||len(C)=00000000000000000000000000000200
-GHASH(H,A,C)=4db870d37cb75fcb46097c36230d1612
-C=522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad
-T=b094dac5d93471bdec1a502270e3cc6c
+test="Test Case 12"
+K=feffe9928665731c6d6a8f9467308308feffe9928665731c
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
+A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+H=466923ec9ae682214f2c082badb39249
+N1=19aef0f04763b0c87903c5a217d5314f
+N2=62120253f79efc978625d1feb03b5b5b
+N3=b6ce2a84e366de900fa78a1653df77fb
+N4=374ecad90487f0bb261ba817447e022c
+len({})||len(IV)=000000000000000000000000000001e0
+Y0=4505cdc367a054c5002820e96aebef27
+E(K,Y0)=5ea3194f9dd012a3b9bc5103d6e0284d
+X1=f3bf7ba3e305aeb05ed0d2e4fe076666
+X2=20a51fa2302e9c01b87c48f2c3d91a56
+Y1=4505cdc367a054c5002820e96aebef28
+E(K,Y1)=0b4fba4de46722d9ed691f9f2029df65
+Y2=4505cdc367a054c5002820e96aebef29
+E(K,Y2)=9b4e088bf380b03540bb87a5a257e437
+Y3=4505cdc367a054c5002820e96aebef2a
+E(K,Y3)=9ddb9c873a5cd48acd3f397cd28f9896
+Y4=4505cdc367a054c5002820e96aebef2b
+E(K,Y4)=5716ee92eff7c4b053d44c0294ea88cd
+X3=f70d61693ea7f53f08c866d6eedb1e4b
+X4=dc40bc9a181b35aed66488071ef282ae
+X5=85ffa424b87b35cac7be9c450f0d7aee
+X6=65233cbe5251f7d246bfc967a8678647
+len(A)||len(C)=00000000000000a000000000000001e0
+GHASH(H,A,C)=82567fb0b4cc371801eadec005968e94
+C=d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b
+T=dcf566ff291c25bbb8568fc3d376a6d9
diff --git a/cmd/bltest/tests/aes_gcm/test13.txt b/cmd/bltest/tests/aes_gcm/test13.txt
index 6918aca77..b589ba413 100644
--- a/cmd/bltest/tests/aes_gcm/test13.txt
+++ b/cmd/bltest/tests/aes_gcm/test13.txt
@@ -1,28 +1,14 @@
-test="Test Case 17"
-K=feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=cafebabefacedbad
-H=acbef20579b4b8ebce889bac8732dad7
-N1=90c22e3d2aca34b971e8bd09708fae5c
-len({})||len(IV)=00000000000000000000000000000040
-Y0=0095df49dd90abe3e4d252475748f5d4
-E(K,Y0)=4f903f37fe611d454217fbfa5cd7d791
-X1=5165d242c2592c0a6375e2622cf925d2
-X2=8efa30ce83298b85fe71abefc0cdd01d
-Y1=0095df49dd90abe3e4d252475748f5d5
-E(K,Y1)=1a471fd432fc7bd70b1ec8fe5e6d6251
-Y2=0095df49dd90abe3e4d252475748f5d6
-E(K,Y2)=29bd481e1ea39d20eb63c7ea118b1792
-Y3=0095df49dd90abe3e4d252475748f5d7
-E(K,Y3)=e2898e46ac5cada3ba83cc1272618a5d
-Y4=0095df49dd90abe3e4d252475748f5d8
-E(K,Y4)=d3c6aefbcea602ce4e1fe026065447bf
-X3=55e1ff68f9249e64b95223858e5cb936
-X4=cef1c034383dc96f733aaa4c99bd3e61
-X5=68588d004fd468f5854515039b08165d
-X6=2378943c034697f72a80fce5059bf3f3
-len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=75a34288b8c68f811c52b2e9a2f97f63
-C=c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f
-T=3a337dbf46a792c45e454913fe2ea8f2
+test="Test Case 14"
+K=0000000000000000000000000000000000000000000000000000000000000000
+P=00000000000000000000000000000000
+IV=000000000000000000000000
+H=dc95c078a2408989ad48a21492842087
+Y0=00000000000000000000000000000001
+E(K,Y0)=530f8afbc74536b9a963b4f1c4cb738b
+Y1=00000000000000000000000000000002
+E(K,Y1)=cea7403d4d606b6e074ec5d3baf39d18
+X1=fd6ab7586e556dba06d69cfe6223b262
+len(A)||len(C)=00000000000000000000000000000080
+GHASH(H,A,C)=83de425c5edc5d498f382c441041ca92
+C=cea7403d4d606b6e074ec5d3baf39d18
+T=d0d1c8a799996bf0265b98b5d48ab919
diff --git a/cmd/bltest/tests/aes_gcm/test14.txt b/cmd/bltest/tests/aes_gcm/test14.txt
index a5c538ea6..f650ea7c6 100644
--- a/cmd/bltest/tests/aes_gcm/test14.txt
+++ b/cmd/bltest/tests/aes_gcm/test14.txt
@@ -1,31 +1,23 @@
-test="Test Case 18"
+test="Test Case 15"
 K=feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
+IV=cafebabefacedbaddecaf888
 H=acbef20579b4b8ebce889bac8732dad7
-N1=0bfe66e2032f195516379f5fb710f987
-N2=f0631554d11409915feec8f9f5102aba
-N3=749b90dda19a1557fd9e9fd31fed1d14
-N4=7a6a833f260d848793b327cb07d1b190
-len({})||len(IV)=000000000000000000000000000001e0
-Y0=0cd953e2140a5976079f8e2406bc8eb4
-E(K,Y0)=71b54d092bb0c3d9ba94538d4096e691
-X1=5165d242c2592c0a6375e2622cf925d2
-X2=8efa30ce83298b85fe71abefc0cdd01d
-Y1=0cd953e2140a5976079f8e2406bc8eb5
-E(K,Y1)=83bcdd0af41a551452047196ca6b0cba
-Y2=0cd953e2140a5976079f8e2406bc8eb6
-E(K,Y2)=68151b79baea93c38e149b72e545e186
-Y3=0cd953e2140a5976079f8e2406bc8eb7
-E(K,Y3)=13fccf22159a4d16026ce5d58c7e99fb
-Y4=0cd953e2140a5976079f8e2406bc8eb8
-E(K,Y4)=132b64628a031e79fecd050675a64f07
-X3=e963941cfa8c417bdaa3b3d94ab4e905
-X4=2178d7f836e5fa105ce0fdf0fc8f0654
-X5=bac14eeba3216f966b3e7e011475b832
-X6=cc9ae9175729a649936e890bd971a8bf
-len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=d5ffcf6fc5ac4d69722187421a7f170b
-C=5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f
-T=a44a8266ee1c8eb0c8b5d4cf5ae9f19a
+Y0=cafebabefacedbaddecaf88800000001
+E(K,Y0)=fd2caa16a5832e76aa132c1453eeda7e
+Y1=cafebabefacedbaddecaf88800000002
+E(K,Y1)=8b1cf3d561d27be251263e66857164e7
+Y2=cafebabefacedbaddecaf88800000003
+E(K,Y2)=e29d258faad137135bd49280af645bd8
+Y3=cafebabefacedbaddecaf88800000004
+E(K,Y3)=908c82ddcc65b26e887f85341f243d1d
+Y4=cafebabefacedbaddecaf88800000005
+E(K,Y4)=749cf39639b79c5d06aa8d5b932fc7f8
+X1=fcbefb78635d598eddaf982310670f35
+X2=29de812309d3116a6eff7ec844484f3e
+X3=45fad9deeda9ea561b8f199c3613845b
+X4=ed95f8e164bf3213febc740f0bd9c6af
+len(A)||len(C)=00000000000000000000000000000200
+GHASH(H,A,C)=4db870d37cb75fcb46097c36230d1612
+C=522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad
+T=b094dac5d93471bdec1a502270e3cc6c
diff --git a/cmd/bltest/tests/aes_gcm/test12.txt b/cmd/bltest/tests/aes_gcm/test15.txt
index f1a49e3fe..f1a49e3fe 100644
--- a/cmd/bltest/tests/aes_gcm/test12.txt
+++ b/cmd/bltest/tests/aes_gcm/test15.txt
diff --git a/cmd/bltest/tests/aes_gcm/test16.txt b/cmd/bltest/tests/aes_gcm/test16.txt
new file mode 100644
index 000000000..6918aca77
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/test16.txt
@@ -0,0 +1,28 @@
+test="Test Case 17"
+K=feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
+A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+IV=cafebabefacedbad
+H=acbef20579b4b8ebce889bac8732dad7
+N1=90c22e3d2aca34b971e8bd09708fae5c
+len({})||len(IV)=00000000000000000000000000000040
+Y0=0095df49dd90abe3e4d252475748f5d4
+E(K,Y0)=4f903f37fe611d454217fbfa5cd7d791
+X1=5165d242c2592c0a6375e2622cf925d2
+X2=8efa30ce83298b85fe71abefc0cdd01d
+Y1=0095df49dd90abe3e4d252475748f5d5
+E(K,Y1)=1a471fd432fc7bd70b1ec8fe5e6d6251
+Y2=0095df49dd90abe3e4d252475748f5d6
+E(K,Y2)=29bd481e1ea39d20eb63c7ea118b1792
+Y3=0095df49dd90abe3e4d252475748f5d7
+E(K,Y3)=e2898e46ac5cada3ba83cc1272618a5d
+Y4=0095df49dd90abe3e4d252475748f5d8
+E(K,Y4)=d3c6aefbcea602ce4e1fe026065447bf
+X3=55e1ff68f9249e64b95223858e5cb936
+X4=cef1c034383dc96f733aaa4c99bd3e61
+X5=68588d004fd468f5854515039b08165d
+X6=2378943c034697f72a80fce5059bf3f3
+len(A)||len(C)=00000000000000a000000000000001e0
+GHASH(H,A,C)=75a34288b8c68f811c52b2e9a2f97f63
+C=c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f
+T=3a337dbf46a792c45e454913fe2ea8f2
diff --git a/cmd/bltest/tests/aes_gcm/test17.txt b/cmd/bltest/tests/aes_gcm/test17.txt
new file mode 100644
index 000000000..a5c538ea6
--- /dev/null
+++ b/cmd/bltest/tests/aes_gcm/test17.txt
@@ -0,0 +1,31 @@
+test="Test Case 18"
+K=feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
+A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+H=acbef20579b4b8ebce889bac8732dad7
+N1=0bfe66e2032f195516379f5fb710f987
+N2=f0631554d11409915feec8f9f5102aba
+N3=749b90dda19a1557fd9e9fd31fed1d14
+N4=7a6a833f260d848793b327cb07d1b190
+len({})||len(IV)=000000000000000000000000000001e0
+Y0=0cd953e2140a5976079f8e2406bc8eb4
+E(K,Y0)=71b54d092bb0c3d9ba94538d4096e691
+X1=5165d242c2592c0a6375e2622cf925d2
+X2=8efa30ce83298b85fe71abefc0cdd01d
+Y1=0cd953e2140a5976079f8e2406bc8eb5
+E(K,Y1)=83bcdd0af41a551452047196ca6b0cba
+Y2=0cd953e2140a5976079f8e2406bc8eb6
+E(K,Y2)=68151b79baea93c38e149b72e545e186
+Y3=0cd953e2140a5976079f8e2406bc8eb7
+E(K,Y3)=13fccf22159a4d16026ce5d58c7e99fb
+Y4=0cd953e2140a5976079f8e2406bc8eb8
+E(K,Y4)=132b64628a031e79fecd050675a64f07
+X3=e963941cfa8c417bdaa3b3d94ab4e905
+X4=2178d7f836e5fa105ce0fdf0fc8f0654
+X5=bac14eeba3216f966b3e7e011475b832
+X6=cc9ae9175729a649936e890bd971a8bf
+len(A)||len(C)=00000000000000a000000000000001e0
+GHASH(H,A,C)=d5ffcf6fc5ac4d69722187421a7f170b
+C=5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f
+T=a44a8266ee1c8eb0c8b5d4cf5ae9f19a
diff --git a/cmd/bltest/tests/aes_gcm/test2.txt b/cmd/bltest/tests/aes_gcm/test2.txt
index 4083eac7a..8e69bf678 100644
--- a/cmd/bltest/tests/aes_gcm/test2.txt
+++ b/cmd/bltest/tests/aes_gcm/test2.txt
@@ -1,13 +1,10 @@
-test="Test Case 4"
+test="Test Case 3"
 K=feffe9928665731c6d6a8f9467308308
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
 IV=cafebabefacedbaddecaf888
 H=b83b533708bf535d0aa6e52980d53b78
 Y0=cafebabefacedbaddecaf88800000001
 E(K,Y0)=3247184b3c4f69a44dbcd22887bbb418
-X1=ed56aaf8a72d67049fdb9228edba1322
-X2=cd47221ccef0554ee4bb044c88150352
 Y1=cafebabefacedbaddecaf88800000002
 E(K,Y1)=9bb22ce7d9f372c1ee2b28722b25f206
 Y2=cafebabefacedbaddecaf88800000003
@@ -16,11 +13,11 @@ Y3=cafebabefacedbaddecaf88800000004
 E(K,Y3)=3de91827c10e9a4f5240647ee5221f20
 Y4=cafebabefacedbaddecaf88800000005
 E(K,Y4)=aac9e6ccc0074ac0873b9ba85d908bd0
-X3=54f5e1b2b5a8f9525c23924751a3ca51
-X4=324f585c6ffc1359ab371565d6c45f93
-X5=ca7dd446af4aa70cc3c0cd5abba6aa1c
-X6=1590df9b2eb6768289e57d56274c8570
-len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=698e57f70e6ecc7fd9463b7260a9ae5f
-C=42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091
-T=5bc94fbc3221a5db94fae95ae7121a47
+X1=59ed3f2bb1a0aaa07c9f56c6a504647b
+X2=b714c9048389afd9f9bc5c1d4378e052
+X3=47400c6577b1ee8d8f40b2721e86ff10
+X4=4796cf49464704b5dd91f159bb1b7f95
+len(A)||len(C)=00000000000000000000000000000200
+GHASH(H,A,C)=7f1b32b81b820d02614f8895ac1d4eac
+C=42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985
+T=4d5c2af327cd64a62cf35abd2ba6fab4
diff --git a/cmd/bltest/tests/aes_gcm/test3.txt b/cmd/bltest/tests/aes_gcm/test3.txt
index ec62258d0..4083eac7a 100644
--- a/cmd/bltest/tests/aes_gcm/test3.txt
+++ b/cmd/bltest/tests/aes_gcm/test3.txt
@@ -1,28 +1,26 @@
-test="Test Case 5"
+test="Test Case 4"
 K=feffe9928665731c6d6a8f9467308308
 P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=cafebabefacedbad
+IV=cafebabefacedbaddecaf888
 H=b83b533708bf535d0aa6e52980d53b78
-N1=6f288b846e5fed9a18376829c86a6a16
-len({})||len(C)=00000000000000000000000000000040
-Y0=c43a83c4c4badec4354ca984db252f7d
-E(K,Y0)=e94ab9535c72bea9e089c93d48e62fb0
+Y0=cafebabefacedbaddecaf88800000001
+E(K,Y0)=3247184b3c4f69a44dbcd22887bbb418
 X1=ed56aaf8a72d67049fdb9228edba1322
 X2=cd47221ccef0554ee4bb044c88150352
-Y1=c43a83c4c4badec4354ca984db252f7e
-E(K,Y1)=b8040969d08295afd226fcda0ddf61cf
-Y2=c43a83c4c4badec4354ca984db252f7f
-E(K,Y2)=ef3c83225af93122192ad5c4f15dfe51
-Y3=c43a83c4c4badec4354ca984db252f80
-E(K,Y3)=6fbc659571f72de104c67b609d2fde67
-Y4=c43a83c4c4badec4354ca984db252f81
-E(K,Y4)=f8e3581441a1e950785c3ea1430c6fa6
-X3=9379e2feae14649c86cf2250e3a81916
-X4=65dde904c92a6b3db877c4817b50a5f4
-X5=48c53cf863b49a1b0bbfc48c3baaa89d
-X6=08c873f1c8cec3effc209a07468caab1
+Y1=cafebabefacedbaddecaf88800000002
+E(K,Y1)=9bb22ce7d9f372c1ee2b28722b25f206
+Y2=cafebabefacedbaddecaf88800000003
+E(K,Y2)=650d887c3936533a1b8d4e1ea39d2b5c
+Y3=cafebabefacedbaddecaf88800000004
+E(K,Y3)=3de91827c10e9a4f5240647ee5221f20
+Y4=cafebabefacedbaddecaf88800000005
+E(K,Y4)=aac9e6ccc0074ac0873b9ba85d908bd0
+X3=54f5e1b2b5a8f9525c23924751a3ca51
+X4=324f585c6ffc1359ab371565d6c45f93
+X5=ca7dd446af4aa70cc3c0cd5abba6aa1c
+X6=1590df9b2eb6768289e57d56274c8570
 len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=df586bb4c249b92cb6922877e444d37b
-C=61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598
-T=3612d2e79e3b0785561be14aaca2fccb
+GHASH(H,A,C)=698e57f70e6ecc7fd9463b7260a9ae5f
+C=42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091
+T=5bc94fbc3221a5db94fae95ae7121a47
diff --git a/cmd/bltest/tests/aes_gcm/test4.txt b/cmd/bltest/tests/aes_gcm/test4.txt
index 709251b45..ec62258d0 100644
--- a/cmd/bltest/tests/aes_gcm/test4.txt
+++ b/cmd/bltest/tests/aes_gcm/test4.txt
@@ -1,31 +1,28 @@
-test="Test Case 6"
+test="Test Case 5"
 K=feffe9928665731c6d6a8f9467308308
 P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+IV=cafebabefacedbad
 H=b83b533708bf535d0aa6e52980d53b78
-N1=004d6599d7fb1634756e1e299d81630f
-N2=88ffe8a3c8033df4b54d732f7f88408e
-N3=24e694cfab657beabba8055aad495e23
-N4=d8349a5eda24943c8fbb2ef5168b20cb
-len({})||len(IV)=000000000000000000000000000001e0
-Y0=3bab75780a31c059f83d2a44752f9864
-7dc63b399f2d98d57ab073b6baa4138e
+N1=6f288b846e5fed9a18376829c86a6a16
+len({})||len(C)=00000000000000000000000000000040
+Y0=c43a83c4c4badec4354ca984db252f7d
+E(K,Y0)=e94ab9535c72bea9e089c93d48e62fb0
 X1=ed56aaf8a72d67049fdb9228edba1322
 X2=cd47221ccef0554ee4bb044c88150352
-Y1=3bab75780a31c059f83d2a44752f9865
-E(K,Y1)=55d37bbd9ad21353a6f93a690eca9e0e
-Y2=3bab75780a31c059f83d2a44752f9866
-E(K,Y2)=3836bbf6d696e672946a1a01404fa6d5
-Y3=3bab75780a31c059f83d2a44752f9867
-E(K,Y3)=1dd8a5316ecc35c3e313bca59d2ac94a
-Y4=3bab75780a31c059f83d2a44752f9868
-E(K,Y4)=6742982706a9f154f657d5dc94b746db
-X3=31727669c63c6f078b5d22adbbbca384
-X4=480c00db2679065a7ed2f771a53acacd
-X5=1c1ae3c355e2214466a9923d2ba6ab35
-X6=0694c6f16bb0275a48891d06590344b0
+Y1=c43a83c4c4badec4354ca984db252f7e
+E(K,Y1)=b8040969d08295afd226fcda0ddf61cf
+Y2=c43a83c4c4badec4354ca984db252f7f
+E(K,Y2)=ef3c83225af93122192ad5c4f15dfe51
+Y3=c43a83c4c4badec4354ca984db252f80
+E(K,Y3)=6fbc659571f72de104c67b609d2fde67
+Y4=c43a83c4c4badec4354ca984db252f81
+E(K,Y4)=f8e3581441a1e950785c3ea1430c6fa6
+X3=9379e2feae14649c86cf2250e3a81916
+X4=65dde904c92a6b3db877c4817b50a5f4
+X5=48c53cf863b49a1b0bbfc48c3baaa89d
+X6=08c873f1c8cec3effc209a07468caab1
 len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=1c5afe9760d3932f3c9a878aac3dc3de
-C=8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5
-T=619cc5aefffe0bfa462af43c1699d050
+GHASH(H,A,C)=df586bb4c249b92cb6922877e444d37b
+C=61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598
+T=3612d2e79e3b0785561be14aaca2fccb
diff --git a/cmd/bltest/tests/aes_gcm/test5.txt b/cmd/bltest/tests/aes_gcm/test5.txt
index 68bc52138..709251b45 100644
--- a/cmd/bltest/tests/aes_gcm/test5.txt
+++ b/cmd/bltest/tests/aes_gcm/test5.txt
@@ -1,14 +1,31 @@
-test="Test Case 8"
-K=000000000000000000000000000000000000000000000000
-P=00000000000000000000000000000000
-IV=000000000000000000000000
-H=aae06992acbf52a3e8f4a96ec9300bd7
-Y0=00000000000000000000000000000001
-E(K,Y0)=cd33b28ac773f74ba00ed1f312572435
-Y1=00000000000000000000000000000002
-E(K,Y1)=98e7247c07f0fe411c267e4384b0f600
-X1=90e87315fb7d4e1b4092ec0cbfda5d7d
-len(A)||len(C)=00000000000000000000000000000080
-GHASH(H,A,C)=e2c63f0ac44ad0e02efa05ab6743d4ce
-C=98e7247c07f0fe411c267e4384b0f600
-T=2ff58d80033927ab8ef4d4587514f0fb
+test="Test Case 6"
+K=feffe9928665731c6d6a8f9467308308
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
+A=feedfacedeadbeeffeedfacedeadbeefabaddad2
+IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+H=b83b533708bf535d0aa6e52980d53b78
+N1=004d6599d7fb1634756e1e299d81630f
+N2=88ffe8a3c8033df4b54d732f7f88408e
+N3=24e694cfab657beabba8055aad495e23
+N4=d8349a5eda24943c8fbb2ef5168b20cb
+len({})||len(IV)=000000000000000000000000000001e0
+Y0=3bab75780a31c059f83d2a44752f9864
+7dc63b399f2d98d57ab073b6baa4138e
+X1=ed56aaf8a72d67049fdb9228edba1322
+X2=cd47221ccef0554ee4bb044c88150352
+Y1=3bab75780a31c059f83d2a44752f9865
+E(K,Y1)=55d37bbd9ad21353a6f93a690eca9e0e
+Y2=3bab75780a31c059f83d2a44752f9866
+E(K,Y2)=3836bbf6d696e672946a1a01404fa6d5
+Y3=3bab75780a31c059f83d2a44752f9867
+E(K,Y3)=1dd8a5316ecc35c3e313bca59d2ac94a
+Y4=3bab75780a31c059f83d2a44752f9868
+E(K,Y4)=6742982706a9f154f657d5dc94b746db
+X3=31727669c63c6f078b5d22adbbbca384
+X4=480c00db2679065a7ed2f771a53acacd
+X5=1c1ae3c355e2214466a9923d2ba6ab35
+X6=0694c6f16bb0275a48891d06590344b0
+len(A)||len(C)=00000000000000a000000000000001e0
+GHASH(H,A,C)=1c5afe9760d3932f3c9a878aac3dc3de
+C=8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5
+T=619cc5aefffe0bfa462af43c1699d050
diff --git a/cmd/bltest/tests/aes_gcm/test6.txt b/cmd/bltest/tests/aes_gcm/test6.txt
deleted file mode 100644
index 544324035..000000000
--- a/cmd/bltest/tests/aes_gcm/test6.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-test="Test Case 9"
-K=feffe9928665731c6d6a8f9467308308feffe9928665731c
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-IV=cafebabefacedbaddecaf888
-H=466923ec9ae682214f2c082badb39249
-Y0=cafebabefacedbaddecaf88800000001
-E(K,Y0)=c835aa88aebbc94f5a02e179fdcfc3e4
-Y1=cafebabefacedbaddecaf88800000002
-E(K,Y1)=e0b1f82ec484eea44e5ff30128df01cd
-Y2=cafebabefacedbaddecaf88800000003
-E(K,Y2)=0339b5b9b3db2e5e4cc9a38986906bee
-Y3=cafebabefacedbaddecaf88800000004
-E(K,Y3)=614b3195542ccc7683ae933c81ec8a62
-Y4=cafebabefacedbaddecaf88800000005
-E(K,Y4)=a988a97e85eec28e76b95c29b6023003
-X1=dddca3f91c17821ffac4a6d0fed176f7
-X2=a4e84ac60e2730f4a7e0e1eef708b198
-X3=e67592048dd7153973a0dbbb8804bee2
-X4=503e86628536625fb746ce3cecea433f
-len(A)||len(C)=00000000000000000000000000000200
-GHASH(H,A,C)=51110d40f6c8fff0eb1ae33445a889f0
-C=3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256
-T=9924a7c8587336bfb118024db8674a14
diff --git a/cmd/bltest/tests/aes_gcm/test7.txt b/cmd/bltest/tests/aes_gcm/test7.txt
index bcd593929..68bc52138 100644
--- a/cmd/bltest/tests/aes_gcm/test7.txt
+++ b/cmd/bltest/tests/aes_gcm/test7.txt
@@ -1,26 +1,14 @@
-test="Test Case 10"
-K=feffe9928665731c6d6a8f9467308308feffe9928665731c
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=cafebabefacedbaddecaf888
-H=466923ec9ae682214f2c082badb39249
-Y0=cafebabefacedbaddecaf88800000001
-E(K,Y0)=c835aa88aebbc94f5a02e179fdcfc3e4
-X1=f3bf7ba3e305aeb05ed0d2e4fe076666
-X2=20a51fa2302e9c01b87c48f2c3d91a56
-Y1=cafebabefacedbaddecaf88800000002
-E(K,Y1)=e0b1f82ec484eea44e5ff30128df01cd
-Y2=cafebabefacedbaddecaf88800000003
-E(K,Y2)=0339b5b9b3db2e5e4cc9a38986906bee
-Y3=cafebabefacedbaddecaf88800000004
-E(K,Y3)=614b3195542ccc7683ae933c81ec8a62
-Y4=cafebabefacedbaddecaf88800000005
-E(K,Y4)=a988a97e85eec28e76b95c29b6023003
-X3=714f9700ddf520f20695f6180c6e669d
-X4=e858680b7b240d2ecf7e06bbad4524e2
-X5=3f4865abd6bb3fb9f5c4a816f0a9b778
-X6=4256f67fe87b4f49422ba11af857c973
-len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=ed2ce3062e4a8ec06db8b4c490e8a268
-C=3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710
-T=2519498e80f1478f37ba55bd6d27618c
+test="Test Case 8"
+K=000000000000000000000000000000000000000000000000
+P=00000000000000000000000000000000
+IV=000000000000000000000000
+H=aae06992acbf52a3e8f4a96ec9300bd7
+Y0=00000000000000000000000000000001
+E(K,Y0)=cd33b28ac773f74ba00ed1f312572435
+Y1=00000000000000000000000000000002
+E(K,Y1)=98e7247c07f0fe411c267e4384b0f600
+X1=90e87315fb7d4e1b4092ec0cbfda5d7d
+len(A)||len(C)=00000000000000000000000000000080
+GHASH(H,A,C)=e2c63f0ac44ad0e02efa05ab6743d4ce
+C=98e7247c07f0fe411c267e4384b0f600
+T=2ff58d80033927ab8ef4d4587514f0fb
diff --git a/cmd/bltest/tests/aes_gcm/test8.txt b/cmd/bltest/tests/aes_gcm/test8.txt
index 2a4a5a99e..544324035 100644
--- a/cmd/bltest/tests/aes_gcm/test8.txt
+++ b/cmd/bltest/tests/aes_gcm/test8.txt
@@ -1,28 +1,23 @@
-test="Test Case 11"
+test="Test Case 9"
 K=feffe9928665731c6d6a8f9467308308feffe9928665731c
-P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=cafebabefacedbad
+P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
+IV=cafebabefacedbaddecaf888
 H=466923ec9ae682214f2c082badb39249
-N1=9473c07b02544299cf007c42c5778218
-len({})||len(IV)=00000000000000000000000000000040
-Y0=a14378078d27258a6292737e1802ada5
-E(K,Y0)=7bb6d647c902427ce7cf26563a337371
-X1=f3bf7ba3e305aeb05ed0d2e4fe076666
-X2=20a51fa2302e9c01b87c48f2c3d91a56
-Y1=a14378078d27258a6292737e1802ada6
-E(K,Y1)=d621c7bc5690a7b1487dbaab8ac76b22
-Y2=a14378078d27258a6292737e1802ada7
-E(K,Y2)=43c1ca7de78f4495ad0b18324e61fa25
-Y3=a14378078d27258a6292737e1802ada8
-E(K,Y3)=e1e0254a0f2f1626e9aa4ff09d7c64ec
-Y4=a14378078d27258a6292737e1802ada9
-E(K,Y4)=5850f4502486a1681a9319ce7d0afa59
-X3=8bdedafd6ee8e529689de3a269b8240d
-X4=6607feb377b49c9ecdbc696344fe22d8
-X5=8a19570a06500ba9405fcece4a73fb48
-X6=8532826e63ce4a5b89b70fa28f8070fe
-len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=1e6a133806607858ee80eaf237064089
-C=0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7
-T=65dcc57fcf623a24094fcca40d3533f8
+Y0=cafebabefacedbaddecaf88800000001
+E(K,Y0)=c835aa88aebbc94f5a02e179fdcfc3e4
+Y1=cafebabefacedbaddecaf88800000002
+E(K,Y1)=e0b1f82ec484eea44e5ff30128df01cd
+Y2=cafebabefacedbaddecaf88800000003
+E(K,Y2)=0339b5b9b3db2e5e4cc9a38986906bee
+Y3=cafebabefacedbaddecaf88800000004
+E(K,Y3)=614b3195542ccc7683ae933c81ec8a62
+Y4=cafebabefacedbaddecaf88800000005
+E(K,Y4)=a988a97e85eec28e76b95c29b6023003
+X1=dddca3f91c17821ffac4a6d0fed176f7
+X2=a4e84ac60e2730f4a7e0e1eef708b198
+X3=e67592048dd7153973a0dbbb8804bee2
+X4=503e86628536625fb746ce3cecea433f
+len(A)||len(C)=00000000000000000000000000000200
+GHASH(H,A,C)=51110d40f6c8fff0eb1ae33445a889f0
+C=3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256
+T=9924a7c8587336bfb118024db8674a14
diff --git a/cmd/bltest/tests/aes_gcm/test9.txt b/cmd/bltest/tests/aes_gcm/test9.txt
index d46e6f91f..bcd593929 100644
--- a/cmd/bltest/tests/aes_gcm/test9.txt
+++ b/cmd/bltest/tests/aes_gcm/test9.txt
@@ -1,31 +1,26 @@
-test="Test Case 12"
+test="Test Case 10"
 K=feffe9928665731c6d6a8f9467308308feffe9928665731c
 P=d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
 A=feedfacedeadbeeffeedfacedeadbeefabaddad2
-IV=9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
+IV=cafebabefacedbaddecaf888
 H=466923ec9ae682214f2c082badb39249
-N1=19aef0f04763b0c87903c5a217d5314f
-N2=62120253f79efc978625d1feb03b5b5b
-N3=b6ce2a84e366de900fa78a1653df77fb
-N4=374ecad90487f0bb261ba817447e022c
-len({})||len(IV)=000000000000000000000000000001e0
-Y0=4505cdc367a054c5002820e96aebef27
-E(K,Y0)=5ea3194f9dd012a3b9bc5103d6e0284d
+Y0=cafebabefacedbaddecaf88800000001
+E(K,Y0)=c835aa88aebbc94f5a02e179fdcfc3e4
 X1=f3bf7ba3e305aeb05ed0d2e4fe076666
 X2=20a51fa2302e9c01b87c48f2c3d91a56
-Y1=4505cdc367a054c5002820e96aebef28
-E(K,Y1)=0b4fba4de46722d9ed691f9f2029df65
-Y2=4505cdc367a054c5002820e96aebef29
-E(K,Y2)=9b4e088bf380b03540bb87a5a257e437
-Y3=4505cdc367a054c5002820e96aebef2a
-E(K,Y3)=9ddb9c873a5cd48acd3f397cd28f9896
-Y4=4505cdc367a054c5002820e96aebef2b
-E(K,Y4)=5716ee92eff7c4b053d44c0294ea88cd
-X3=f70d61693ea7f53f08c866d6eedb1e4b
-X4=dc40bc9a181b35aed66488071ef282ae
-X5=85ffa424b87b35cac7be9c450f0d7aee
-X6=65233cbe5251f7d246bfc967a8678647
+Y1=cafebabefacedbaddecaf88800000002
+E(K,Y1)=e0b1f82ec484eea44e5ff30128df01cd
+Y2=cafebabefacedbaddecaf88800000003
+E(K,Y2)=0339b5b9b3db2e5e4cc9a38986906bee
+Y3=cafebabefacedbaddecaf88800000004
+E(K,Y3)=614b3195542ccc7683ae933c81ec8a62
+Y4=cafebabefacedbaddecaf88800000005
+E(K,Y4)=a988a97e85eec28e76b95c29b6023003
+X3=714f9700ddf520f20695f6180c6e669d
+X4=e858680b7b240d2ecf7e06bbad4524e2
+X5=3f4865abd6bb3fb9f5c4a816f0a9b778
+X6=4256f67fe87b4f49422ba11af857c973
 len(A)||len(C)=00000000000000a000000000000001e0
-GHASH(H,A,C)=82567fb0b4cc371801eadec005968e94
-C=d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b
-T=dcf566ff291c25bbb8568fc3d376a6d9
+GHASH(H,A,C)=ed2ce3062e4a8ec06db8b4c490e8a268
+C=3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710
+T=2519498e80f1478f37ba55bd6d27618c
diff --git a/cmd/bltest/tests/aes_gcm/test_source.txt b/cmd/bltest/tests/aes_gcm/test_source.txt
index 0b1a4bf82..61c78fcc5 100644
--- a/cmd/bltest/tests/aes_gcm/test_source.txt
+++ b/cmd/bltest/tests/aes_gcm/test_source.txt
@@ -153,15 +153,16 @@ C=8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c
 T=619cc5aefffe0bfa462af43c1699d050
 
 test="Test Case 7"
-K=000000000000000000000000000000000000000000000000000000000000000000000000
+K=000000000000000000000000000000000000000000000000
 P=
-IV=aae06992acbf52a3e8f4a96ec9300bd7
-H=00000000000000000000000000000001
-Y0=cd33b28ac773f74ba00ed1f312572435
-E(K,Y0)=00000000000000000000000000000000
+IV=000000000000000000000000
+H=aae06992acbf52a3e8f4a96ec9300bd7
+Y0=00000000000000000000000000000001
+E(K,Y0)=cd33b28ac773f74ba00ed1f312572435
+len(A)||len(C)=00000000000000000000000000000000
 GHASH(H,A,C)=00000000000000000000000000000000
 C=
-T=cd33b28ac773f74ba00ed1f31257243
+T=cd33b28ac773f74ba00ed1f312572435
 
 test="Test Case 8"
 K=000000000000000000000000000000000000000000000000
diff --git a/tests/cipher/cipher.txt b/tests/cipher/cipher.txt
index ea4fabb43..6fe10f36b 100644
--- a/tests/cipher/cipher.txt
+++ b/tests/cipher/cipher.txt
@@ -20,6 +20,9 @@
 	0	aes_ecb_-D	AES_ECB_Decrypt
 	0	aes_cbc_-E	AES_CBC_Encrypt
 	0	aes_cbc_-D	AES_CBC_Decrypt
+	0	aes_ctr		AES_CTR
+	0	aes_cts		AES_CTS
+	0	aes_gcm		AES_GCM
 	0	camellia_ecb_-E	Camellia_ECB_Encrypt
 	0	camellia_ecb_-D	Camellia_ECB_Decrypt
 	0	camellia_cbc_-E	Camellia_CBC_Encrypt
diff --git a/tests/cipher/dsa.txt b/tests/cipher/dsa.txt
index f8c4212e5..f2d3401f4 100644
--- a/tests/cipher/dsa.txt
+++ b/tests/cipher/dsa.txt
@@ -9,3 +9,5 @@
   dsa        64         20         200         5
   dsa        96         20         200         3
   dsa       128         20         200         3
+  dsa       256         20         200         3
+  dsa       384         20         200         3
diff --git a/tests/cipher/symmkey.txt b/tests/cipher/symmkey.txt
index ed02ec16f..ad4b11ab4 100644
--- a/tests/cipher/symmkey.txt
+++ b/tests/cipher/symmkey.txt
@@ -24,6 +24,10 @@
  aes_cbc     16       8192       10000        100000
  aes_ecb     32       8192       10000        100000
  aes_cbc     32       8192       10000        100000
+ aes_ctr     16       8192       10000        100000
+ aes_ctr     32       8192       10000        100000
+ aes_gcm     16       8192       10000        100000
+ aes_gcm     32       8192       10000        100000
  camellia_ecb     16       8192       10000        100000
  camellia_cbc     16       8192       10000        100000
  camellia_ecb     32       8192       10000        100000