From 25f329b8a45b6f84f9a01a0326db48f6853dc59c Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Tue, 24 Apr 2012 20:09:51 +0000
Subject: Patrick Pelletier noted on the mailing list that the implementation
 of Camellia exposed by the OpenSSL module is parameterized by the key length,
 much as AES is, while the version in the main source uses a single name/type
 for all variants. For consistency, convert to using a key length
 parameterized name in our version as well. In the future this might allow for
 better loop unrolling, etc but currently we don't make use of that.

---
 checks/validate.dat | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'checks')

diff --git a/checks/validate.dat b/checks/validate.dat
index 6b9a49e52..4c579bf81 100644
--- a/checks/validate.dat
+++ b/checks/validate.dat
@@ -4123,26 +4123,28 @@ F0E1D2C3B4A5968778695A4B3C2D1E0F00112233445566
 FEDCBA9876543210:05044B62FA52D080:\
 F0E1D2C3B4A5968778695A4B3C2D1E0F0011223344556677
 
-[Camellia]
+[Camellia-128]
 # From RFC 3713
-
 0123456789ABCDEFFEDCBA9876543210:67673138549669730857065648EABE43:\
 0123456789ABCDEFFEDCBA9876543210
 
-0123456789ABCDEFFEDCBA9876543210:B4993401B3E996F84EE5CEE7D79B09B9:\
-0123456789ABCDEFFEDCBA98765432100011223344556677
-
-0123456789ABCDEFFEDCBA9876543210:9ACC237DFF16D76C20EF7C919E3A7509:\
-0123456789ABCDEFFEDCBA987654321000112233445566778899AABBCCDDEEFF
-
-# From NESSIE
-
+# Nessie
 00000000000000000000000000000000:6C227F749319A3AA7DA235A9BBA05A2C:\
 80000000000000000000000000000000
 
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:25DD9EB9DD67FBC6E8431F56F4FBE651:\
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 
+[Camellia-192]
+# From RFC 3713
+0123456789ABCDEFFEDCBA9876543210:B4993401B3E996F84EE5CEE7D79B09B9:\
+0123456789ABCDEFFEDCBA98765432100011223344556677
+
+[Camellia-256]
+# From RFC 3713
+0123456789ABCDEFFEDCBA9876543210:9ACC237DFF16D76C20EF7C919E3A7509:\
+0123456789ABCDEFFEDCBA987654321000112233445566778899AABBCCDDEEFF
+
 # First one is from RFC 2144. The rest were done with OpenSSL and bits taken
 # from /dev/urandom
 [CAST-128]
-- 
cgit v1.2.3