summaryrefslogtreecommitdiff
path: root/selftest.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <[email protected]>2020-09-10 14:48:48 -0400
committerAdam Ierymenko <[email protected]>2020-09-10 14:48:48 -0400
commit1ad555a0711b43477be5d58f174b6850fd1830e9 (patch)
tree9969481ee6f11559d192dc76489add75a2276c75 /selftest.cpp
parent4cd3d0bb76c988bb9503cc614528ae53a80ec0c1 (diff)
More selective push of AES modifications and refactoring stuff.
Diffstat (limited to 'selftest.cpp')
-rw-r--r--selftest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/selftest.cpp b/selftest.cpp
index 73281e6a..926a6ebc 100644
--- a/selftest.cpp
+++ b/selftest.cpp
@@ -198,7 +198,7 @@ static int testCrypto()
bytes += 1234567.0;
}
uint64_t end = OSUtils::now();
- SHA512::hash(buf1,bb,1234567);
+ SHA512(buf1,bb,1234567);
std::cout << ((bytes / 1048576.0) / ((long double)(end - start) / 1024.0)) << " MiB/second (" << Utils::hex(buf1,16,hexbuf) << ')' << std::endl;
::free((void *)bb);
}
@@ -250,13 +250,13 @@ static int testCrypto()
bytes += 1234567.0;
}
uint64_t end = OSUtils::now();
- SHA512::hash(buf1,bb,1234567);
+ SHA512(buf1,bb,1234567);
std::cout << ((bytes / 1048576.0) / ((long double)(end - start) / 1024.0)) << " MiB/second (" << Utils::hex(buf1,16,hexbuf) << ')' << std::endl;
::free((void *)bb);
}
std::cout << "[crypto] Testing SHA-512... "; std::cout.flush();
- SHA512::hash(buf1,sha512TV0Input,(unsigned int)strlen(sha512TV0Input));
+ SHA512(buf1,sha512TV0Input,(unsigned int)strlen(sha512TV0Input));
if (memcmp(buf1,sha512TV0Digest,64)) {
std::cout << "FAIL" << std::endl;
return -1;
@@ -617,8 +617,8 @@ static int testPacket()
return -1;
}
- a.armor(salsaKey,true);
- if (!a.dearmor(salsaKey)) {
+ a.armor(salsaKey,true,nullptr);
+ if (!a.dearmor(salsaKey,nullptr)) {
std::cout << "FAIL (encrypt-decrypt/verify)" << std::endl;
return -1;
}