diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-12-14 12:15:58 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-12-14 12:15:58 -0500 |
| commit | 235c615a10b418974354c38218bc29beda2ae7e4 (patch) | |
| tree | 530d0caa4b8713e0bf333799c8db39d509fbc2c0 /validat7.cpp | |
| parent | 00f777661db51b8638707bb92adca3101c0dbe03 (diff) | |
| download | cryptopp-git-235c615a10b418974354c38218bc29beda2ae7e4.tar.gz | |
Make TestCurve25519 available in Release builds
Diffstat (limited to 'validat7.cpp')
| -rw-r--r-- | validat7.cpp | 56 |
1 files changed, 55 insertions, 1 deletions
diff --git a/validat7.cpp b/validat7.cpp index 91741651..b429d89d 100644 --- a/validat7.cpp +++ b/validat7.cpp @@ -22,10 +22,14 @@ #include "xtr.h"
#include "hmqv.h"
#include "pubkey.h"
-#include "xed25519.h"
#include "xtrcrypt.h"
#include "eccrypto.h"
+// Curve25519
+#include "xed25519.h"
+#include "donna.h"
+#include "naclite.h"
+
#include <iostream>
#include <iomanip>
#include <sstream>
@@ -352,5 +356,55 @@ bool ValidateEC2N_Agreement() return pass;
}
+// TestCurve25519 is slighty more comprehensive than ValidateX25519
+// because it cross-validates against Bernstein's NaCL library.
+// TestCurve25519 called in Debug builds.
+bool TestCurve25519()
+{
+ std::cout << "\nTesting curve25519 Key Agreements...\n\n";
+ const unsigned int AGREE_COUNT = 64;
+ bool pass = true;
+
+ SecByteBlock priv1(32), priv2(32), pub1(32), pub2(32), share1(32), share2(32);
+ for (unsigned int i=0; i<AGREE_COUNT; ++i)
+ {
+ GlobalRNG().GenerateBlock(priv1, priv1.size());
+ GlobalRNG().GenerateBlock(priv2, priv2.size());
+
+ priv1[0] &= 248; priv1[31] &= 127; priv1[31] |= 64;
+ priv2[0] &= 248; priv2[31] &= 127; priv2[31] |= 64;
+
+ // Andrew Moon's curve25519-donna
+ Donna::curve25519(pub1, priv1);
+ Donna::curve25519(pub2, priv2);
+
+ int ret1 = Donna::curve25519(share1, priv1, pub2);
+ int ret2 = Donna::curve25519(share2, priv2, pub1);
+ int ret3 = std::memcmp(share1, share2, 32);
+
+#if defined(NO_OS_DEPENDENCE)
+ int ret4=0, ret5=0, ret6=0;
+#else
+ // Bernstein's NaCl requires DefaultAutoSeededRNG.
+ NaCl::crypto_box_keypair(pub2, priv2);
+
+ int ret4 = Donna::curve25519(share1, priv1, pub2);
+ int ret5 = NaCl::crypto_scalarmult(share2, priv2, pub1);
+ int ret6 = std::memcmp(share1, share2, 32);
+#endif
+
+ bool fail = ret1 != 0 || ret2 != 0 || ret3 != 0 || ret4 != 0 || ret5 != 0 || ret6 != 0;
+ pass = pass && !fail;
+ }
+
+ if (pass)
+ std::cout << "passed:";
+ else
+ std::cout << "FAILED:";
+ std::cout << " " << AGREE_COUNT << " key agreements" << std::endl;
+
+ return pass;
+}
+
NAMESPACE_END // Test
NAMESPACE_END // CryptoPP
|