diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-04-18 12:22:44 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-04-18 12:22:44 -0700 |
| commit | aaf597f0205b79c0f1d8523f15c8d8aaecb63f43 (patch) | |
| tree | 3824dfca12d1dc35530692f6732b47964c6a26cb /ext | |
| parent | 72bd3064a20aec9b1fcbc86bb590aca87f4eca71 (diff) | |
| download | infinitytier-aaf597f0205b79c0f1d8523f15c8d8aaecb63f43.tar.gz infinitytier-aaf597f0205b79c0f1d8523f15c8d8aaecb63f43.zip | |
Cleanup, Windows fixes, Self test fix
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/x64-salsa2012-asm/salsa2012.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/x64-salsa2012-asm/salsa2012.h b/ext/x64-salsa2012-asm/salsa2012.h index d47059b4..d8c2e48c 100644 --- a/ext/x64-salsa2012-asm/salsa2012.h +++ b/ext/x64-salsa2012-asm/salsa2012.h @@ -2,11 +2,9 @@ extern "C" { #endif +// Generates Salsa20/12 key stream // output, outlen, nonce, key (256-bit / 32-byte) -extern int zt_salsa2012_amd64_xmm6(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - -// ciphertext, message, mlen, nonce, key -extern int zt_salsa2012_amd64_xmm6_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); +extern int zt_salsa2012_amd64_xmm6(unsigned char *, unsigned long long, const unsigned char *, const unsigned char *); #ifdef __cplusplus } |