From 22511bbd3414fad0a9bdb41a8aeca34a32d7ab37 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Wed, 17 Jun 2009 14:21:34 +0200 Subject: [PATCH] added 6 Camellia test vectors --- src/libstrongswan/plugins/test_vectors/Makefile.am | 3 ++- .../plugins/test_vectors/test_vectors.h | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.am b/src/libstrongswan/plugins/test_vectors/Makefile.am index a09b64885..b399d0da6 100644 --- a/src/libstrongswan/plugins/test_vectors/Makefile.am +++ b/src/libstrongswan/plugins/test_vectors/Makefile.am @@ -8,9 +8,10 @@ plugin_LTLIBRARIES = libstrongswan-test-vectors.la libstrongswan_test_vectors_la_SOURCES = \ test_vectors_plugin.h test_vectors_plugin.c test_vectors.h \ test_vectors/3des_cbc.c \ - test_vectors/blowfish.c \ test_vectors/aes_cbc.c \ test_vectors/aes_xcbc.c \ + test_vectors/blowfish.c \ + test_vectors/camellia_cbc.c \ test_vectors/md5.c \ test_vectors/md5_hmac.c \ test_vectors/sha1.c \ diff --git a/src/libstrongswan/plugins/test_vectors/test_vectors.h b/src/libstrongswan/plugins/test_vectors/test_vectors.h index 69fe85472..e5c246be7 100644 --- a/src/libstrongswan/plugins/test_vectors/test_vectors.h +++ b/src/libstrongswan/plugins/test_vectors/test_vectors.h @@ -13,16 +13,22 @@ * for more details. */ -TEST_VECTOR_CRYPTER(des3_cbc1) -TEST_VECTOR_CRYPTER(des3_cbc2) -TEST_VECTOR_CRYPTER(blowfish1) -TEST_VECTOR_CRYPTER(blowfish2) TEST_VECTOR_CRYPTER(aes_cbc1) TEST_VECTOR_CRYPTER(aes_cbc2) TEST_VECTOR_CRYPTER(aes_cbc3) TEST_VECTOR_CRYPTER(aes_cbc4) TEST_VECTOR_CRYPTER(aes_cbc5) TEST_VECTOR_CRYPTER(aes_cbc6) +TEST_VECTOR_CRYPTER(blowfish1) +TEST_VECTOR_CRYPTER(blowfish2) +TEST_VECTOR_CRYPTER(camellia_cbc1) +TEST_VECTOR_CRYPTER(camellia_cbc2) +TEST_VECTOR_CRYPTER(camellia_cbc3) +TEST_VECTOR_CRYPTER(camellia_cbc4) +TEST_VECTOR_CRYPTER(camellia_cbc5) +TEST_VECTOR_CRYPTER(camellia_cbc6) +TEST_VECTOR_CRYPTER(des3_cbc1) +TEST_VECTOR_CRYPTER(des3_cbc2) TEST_VECTOR_SIGNER(aes_xcbc_s1) TEST_VECTOR_SIGNER(aes_xcbc_s2)