dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ASM Salsa20 since it will not be the default in 2.x any more... reduce build complexity.

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-16 14:26:25 -07:00
parent 2b681c37ac
commit 51a25fdec9
No known key found for this signature in database
GPG key ID: 1657198823E52A61
5 changed files with 284 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

65
selftest.cpp
View file

@ -209,13 +209,36 @@ static int testCrypto()
}
double gcmBytes = 0.0;
int64_t start = OSUtils::now();
for(unsigned long i=0;i<150000;++i) {
for(unsigned long i=0;i<100000;++i) {
tv.gcmEncrypt((const uint8_t *)hexbuf,buf1,sizeof(buf1),nullptr,0,buf2,(uint8_t *)(hexbuf + 32),16);
gcmBytes += (double)sizeof(buf1);
tv.gcmEncrypt((const uint8_t *)hexbuf,buf2,sizeof(buf2),nullptr,0,buf1,(uint8_t *)(hexbuf + 32),16);
gcmBytes += (double)(sizeof(buf1) * 2);
}
int64_t end = OSUtils::now();
*dummy = buf1[0];
std::cout << ((gcmBytes / 1048576.0) / ((long double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
std::cout << ((gcmBytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl << " AES-256 ECB scramble (benchmark): "; std::cout.flush();
double ecbBytes = 0.0;
start = OSUtils::now();
for(unsigned long i=0;i<100000;++i) {
tv.ecbEncrypt(buf1,sizeof(buf1),buf2);
tv.ecbEncrypt(buf2,sizeof(buf1),buf1);
ecbBytes += (double)(sizeof(buf1) * 2);
}
end = OSUtils::now();
*dummy = buf1[0];
std::cout << ((ecbBytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl << " AES-256 GCM + ECB scramble (benchmark): "; std::cout.flush();
ecbBytes = 0.0;
start = OSUtils::now();
for(unsigned long i=0;i<100000;++i) {
tv.gcmEncrypt((const uint8_t *)hexbuf,buf1,sizeof(buf1),nullptr,0,buf2,(uint8_t *)(hexbuf + 32),16);
tv.ecbEncrypt(buf1,sizeof(buf1),buf2);
tv.gcmEncrypt((const uint8_t *)hexbuf,buf2,sizeof(buf2),nullptr,0,buf1,(uint8_t *)(hexbuf + 32),16);
tv.ecbEncrypt(buf2,sizeof(buf1),buf1);
ecbBytes += (double)(sizeof(buf1) * 2);
}
end = OSUtils::now();
*dummy = buf1[0];
std::cout << ((ecbBytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
std::cout << "[crypto] Testing Salsa20... "; std::cout.flush();
for(unsigned int i=0;i<4;++i) {
@ -275,42 +298,6 @@ static int testCrypto()
::free((void *)bb);
}
#ifdef ZT_USE_X64_ASM_SALSA2012
std::cout << "[crypto] Benchmarking Salsa20/12 fast x64 ASM... "; std::cout.flush();
{
unsigned char *bb = (unsigned char *)::malloc(1234567);
double bytes = 0.0;
uint64_t start = OSUtils::now();
for(unsigned int i=0;i<200;++i) {
zt_salsa2012_amd64_xmm6(bb,1234567,s20TV0Iv,s20TV0Key);
bytes += 1234567.0;
}
uint64_t end = OSUtils::now();
*dummy = bb[0];
std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
::free((void *)bb);
}
#endif
#ifdef ZT_USE_ARM32_NEON_ASM_SALSA2012
if (zt_arm_has_neon()) {
std::cout << "[crypto] Benchmarking Salsa20/12 fast arm32/neon ASM... "; std::cout.flush();
{
unsigned char *bb = (unsigned char *)::malloc(1234567);
double bytes = 0.0;
uint64_t start = OSUtils::now();
for(unsigned int i=0;i<200;++i) {
zt_salsa2012_armneon3_xor(bb,(const unsigned char *)0,1234567,s20TV0Iv,s20TV0Key);
bytes += 1234567.0;
}
uint64_t end = OSUtils::now();
*dummy = bb[0];
std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
::free((void *)bb);
}
}
#endif
std::cout << "[crypto] Benchmarking Salsa20/20... "; std::cout.flush();
{
unsigned char *bb = (unsigned char *)::malloc(1234567);