summaryrefslogtreecommitdiff
path: root/test.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2017-04-10 10:52:40 -0400
committerJeffrey Walton <noloader@gmail.com>2017-04-10 10:52:40 -0400
commit8ca0f479391c54ee454e9cddfcbe1657da240f85 (patch)
tree68b52541de179f62f3cd7e83c09f09bada8d4649 /test.cpp
parent8c7408bcd56ab3177ee61fe68ff07cc16d13cdd4 (diff)
downloadcryptopp-git-8ca0f479391c54ee454e9cddfcbe1657da240f85.tar.gz
Add ARIA block cipher
This is the reference implementation, test data and test vectors from the ARIA.zip package on the KISA website. The website is located at http://seed.kisa.or.kr/iwt/ko/bbs/EgovReferenceList.do?bbsId=BBSMSTR_000000000002. We have optimized routines that improve Key Setup and Bulk Encryption performance, but they are not being checked-in at the moment. The ARIA team is updating its implementation for contemporary hardware and we would like to use it as a starting point before we wander too far away from the KISA implementation.
Diffstat (limited to 'test.cpp')
-rw-r--r--test.cpp34
1 files changed, 18 insertions, 16 deletions
diff --git a/test.cpp b/test.cpp
index ba2e0480..45e3ed4d 100644
--- a/test.cpp
+++ b/test.cpp
@@ -25,6 +25,7 @@
#include "stdcpp.h"
#include "ossig.h"
#include "trap.h"
+#include "aria.h"
#include "validate.h"
#include "bench.h"
@@ -971,22 +972,23 @@ bool Validate(int alg, bool thorough, const char *seedInput)
case 60: result = Test::ValidateDLIES(); break;
case 61: result = Test::ValidateBaseCode(); break;
case 62: result = Test::ValidateSHACAL2(); break;
- case 63: result = Test::ValidateCamellia(); break;
- case 64: result = Test::ValidateWhirlpool(); break;
- case 65: result = Test::ValidateTTMAC(); break;
- case 66: result = Test::ValidateSalsa(); break;
- case 67: result = Test::ValidateSosemanuk(); break;
- case 68: result = Test::ValidateVMAC(); break;
- case 69: result = Test::ValidateCCM(); break;
- case 70: result = Test::ValidateGCM(); break;
- case 71: result = Test::ValidateCMAC(); break;
- case 72: result = Test::ValidateHKDF(); break;
- case 73: result = Test::ValidateBLAKE2s(); break;
- case 74: result = Test::ValidateBLAKE2b(); break;
- case 75: result = Test::ValidatePoly1305(); break;
- case 76: result = Test::ValidateSipHash(); break;
- case 77: result = Test::ValidateHashDRBG(); break;
- case 78: result = Test::ValidateHmacDRBG(); break;
+ case 63: result = Test::ValidateARIA(); break;
+ case 64: result = Test::ValidateCamellia(); break;
+ case 65: result = Test::ValidateWhirlpool(); break;
+ case 66: result = Test::ValidateTTMAC(); break;
+ case 67: result = Test::ValidateSalsa(); break;
+ case 68: result = Test::ValidateSosemanuk(); break;
+ case 69: result = Test::ValidateVMAC(); break;
+ case 70: result = Test::ValidateCCM(); break;
+ case 71: result = Test::ValidateGCM(); break;
+ case 72: result = Test::ValidateCMAC(); break;
+ case 73: result = Test::ValidateHKDF(); break;
+ case 74: result = Test::ValidateBLAKE2s(); break;
+ case 75: result = Test::ValidateBLAKE2b(); break;
+ case 76: result = Test::ValidatePoly1305(); break;
+ case 77: result = Test::ValidateSipHash(); break;
+ case 78: result = Test::ValidateHashDRBG(); break;
+ case 79: result = Test::ValidateHmacDRBG(); break;
#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS)
// http://github.com/weidai11/cryptopp/issues/92