From 1b7abaadccf680c836b39a316776b8888a679b14 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Thu, 18 Mar 2021 00:49:39 -0400
Subject: [PATCH] Add additional HIGHT test vectors (GH #672, GH #1010)

---
 TestVectors/hight.txt | 67 +++++++++++++++++++++++++++++++++++++++++++
 regtest3.cpp          |  1 +
 2 files changed, 68 insertions(+)

diff --git a/TestVectors/hight.txt b/TestVectors/hight.txt
index 4ed17b7c..66f150b0 100644
--- a/TestVectors/hight.txt
+++ b/TestVectors/hight.txt
@@ -106,6 +106,73 @@ Plaintext  : 32 22 F4 CC CF D3 90 2D
 Ciphertext : BB 80 F5 0B 35 11 5B A8
 Test: Encrypt
 
+AlgorithmType: SymmetricCipher
+Name: HIGHT/CBC
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07
+Ciphertext: CE 15 95 08 5A 18 8C 28
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47 63 4A 00 01 2F A0 E9 F0
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47 63 4A 00 01 2F A0 E9 F0 44 9D E2 BC C1 68 51 6C
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47 63 4A 00 01 2F A0 E9 F0 44 9D E2 BC C1 68 51 6C 0E 27 45 AC 37 C1 A6 74
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47 63 4A 00 01 2F A0 E9 F0 44 9D E2 BC C1 68 51 6C 0E 27 45 AC 37 C1 A6 74 3A 1E A5 1E B4 07 D1 4E
+Test: Encrypt
+#
+Source: HIGHT reference implementation
+Comment: HIGHT/CBC, 128-bit key
+Key: 88 E3 4F 8F 08 17 79 F1 E9 F3 94 37 0A D4 05 89
+IV: 26 8D 66 A7 35 A8 1A 81
+Plaintext: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
+Ciphertext: CE 15 95 08 5A 18 8C 28 C1 8D 77 08 D9 C1 25 86 4B 3D AF 2B F2 0D 52 47 63 4A 00 01 2F A0 E9 F0 44 9D E2 BC C1 68 51 6C 0E 27 45 AC 37 C1 A6 74 3A 1E A5 1E B4 07 D1 4E C8 C4 B4 35 CA 05 CC 62
+Test: Encrypt
+
 AlgorithmType: SymmetricCipher
 Name: HIGHT/CTR
 #
diff --git a/regtest3.cpp b/regtest3.cpp
index 370756a6..0d2f6fdc 100644
--- a/regtest3.cpp
+++ b/regtest3.cpp
@@ -59,6 +59,7 @@ void RegisterFactories4()
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<ARIA> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<HIGHT> >();
+	RegisterSymmetricCipherDefaultFactories<CBC_Mode<HIGHT> >();
 	RegisterSymmetricCipherDefaultFactories<CTR_Mode<HIGHT> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<TEA> >();