diff --git a/TestVectors/sm3.txt b/TestVectors/sm3.txt
index 6131de2e..33d08472 100644
--- a/TestVectors/sm3.txt
+++ b/TestVectors/sm3.txt
@@ -18,117 +18,117 @@ Test: Verify
 Digest: 00000000 2275b8a1 38604889 c18e5a4d 6fdb70e5 387e5765 293dcba3 9c0c5732
 Test: NotVerify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 0 words
 Message:
 Digest: 1AB21D83 55CFA17F 8E611948 31E81A8F 22BEC8C7 28FEFB74 7ED035EB 5082AA2B
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
-Comment: 1 words
+Source: Crypto++ 6.0 generated
+Comment: 1 word
 Message: 61626364
 Digest: 82EC580F E6D36AE4 F81CAE3C 73F4A5B3 B5A09C94 3172DC90 53C69FD8 E18DCA1E
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 2 words
 Message: 61626364 61626364
 Digest: B58B85B7 95B34879 C354428F 7C78CD14 86C4EF25 EA4C5D68 E611FF41 C15731EF
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 3 words
 Message: 61626364 61626364 61626364
 Digest: FD959B25 60DADD0C 0839144B E6090CB6 65915156 179C1FA6 DC00292D A7A2B9C2
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 4 words
 Message: 61626364 61626364 61626364 61626364
 Digest: 639C6F6B 30D93ECE BD559A95 3BA2EB72 705DB7D2 BE82BBF3 2979380E 02124971
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 5 words
 Message: 61626364 61626364 61626364 61626364 61626364
 Digest: 3F037128 7A1D1FD1 98E12BBA 07E94AE5 815DC7E0 6BA45856 B6E53E56 F1594F23
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 6 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 8D15C0B9 E7540B5F 41B35977 4127EE51 D126A3C7 80357336 C7D39D6F FC01F130
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 7 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 0A5A2FAF BA54C2A6 593B18C5 877C50C2 6BEE5369 BC7F07B0 C66A641E 49295419
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 8 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 73EDEF5C 9D3710F1 4DBAF892 F50CE9DF AB48E462 D837D93E C0F9422C 5F2A4007
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 9 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364
 Digest: 28A6A907 842A5B4A 360CEAD2 FF6F0B96 F1B28C12 E5C9ED0B E58169C2 6863B0D8
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 10 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364
 Digest: 035BE9AC D343D371 1A61972E A6A80D4D EB38E40C 901F1CD2 0786CF57 C82CE8ED
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 11 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364
 Digest: 7A04F699 DEF87C0E F8A9DD44 D46A71A3 9E6B594B C467298D 04454E52 AA922DCA
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 12 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364
 Digest: 6FE77B62 7C1A12BC 367D13C8 F07B32FF BDE1A537 B1B9CB06 1BF7D75A 692E02BB
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 13 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364
 Digest: 4251F280 685451D9 F73D75E6 D59F4E3F 140F3A0B 22F9CB04 16E4DD15 C1410D11
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 14 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 9A032F0C F27E4B40 8F252452 D451CAC5 1A422D43 AE73AB6C D7EC2483 241358E9
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 15 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 7B0685C8 8114BEE1 54296C26 2D619A3D 43C4FBF3 25D5DCB6 F2BBDBF9 6D4275DB
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 16 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: DEBE9FF9 2275B8A1 38604889 C18E5A4D 6FDB70E5 387E5765 293DCBA3 9C0C5732
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 17 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
@@ -136,7 +136,7 @@ Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 860F7AD1 18996A6F 631C5E4A C693157A EFDA97A1 8A873D33 23F64C28 A8A44FC5
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 18 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
@@ -144,10 +144,50 @@ Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364
 Digest: 0C5E778E F656184F 8C9EE54F 0FE0C9CE 5059E02C 77132518 4619BE82 C92A8C5A
 Test: Verify
 #
-Source: Crypto++ 5.6.5 generated
+Source: Crypto++ 6.0 generated
 Comment: 19 words
 Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
          61626364 61626364 61626364
 Digest: BB78EAEB 6B00D13D 43AB682B 8D65512A A9E91FBC 8C6C2841 C6B96345 F44F9652
 Test: Verify
+#
+Source: Crypto++ 6.0 generated
+Comment: 20 words
+Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364
+Digest: 716F5396 CC931260 9C28C645 344EC695 FDABDB9F BF11DE36 C1B33AC5 291CCA6C
+Test: Verify
+#
+Source: Crypto++ 6.0 generated
+Comment: 21 words
+Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364
+Digest: 24CE4FBA AB353814 F890561C BDE3D103 08C33AC6 831FF74E 236E8E05 25B2CD4E
+Test: Verify
+#
+Source: Crypto++ 6.0 generated
+Comment: 22 words
+Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364
+Digest: 5852844C BC2D742D 4B129392 646B3A10 29C54F98 13EEC409 012BF2C4 BF0ACDEB
+Test: Verify
+#
+Source: Crypto++ 6.0 generated
+Comment: 23 words
+Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364
+Digest: 3EFB9D84 992A8760 7DC43D91 FB818CDB EBE3F6CF AC664564 95F6CB92 2F9C2FB3
+Test: Verify
+#
+Source: Crypto++ 6.0 generated
+Comment: 24 words
+Message: 61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364 \
+         61626364 61626364 61626364 61626364 61626364 61626364 61626364 61626364
+Digest: 994BF36E B6C0099B 21D6EAD2 CF71490E A57AA845 F0FEED97 D7F8CE27 88E22342
+Test: Verify