From 9a35ba5bfda410db9cb2a60ad8de437609e7214e Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 27 Apr 2013 04:34:53 -0700 Subject: [PATCH] crypto_stream_(before|after)nm is not implemented for salsa20* stream ciphers Adding this interface is trivial, but until it's done, remove references to it. --- src/libsodium/crypto_stream/salsa20/ref/api.h | 4 ---- src/libsodium/crypto_stream/salsa2012/ref/api.h | 4 ---- src/libsodium/crypto_stream/salsa208/ref/api.h | 4 ---- src/libsodium/crypto_stream/xsalsa20/ref/api.h | 4 ---- src/libsodium/include/sodium/crypto_stream_salsa20.h | 12 ------------ .../include/sodium/crypto_stream_salsa2012.h | 12 ------------ .../include/sodium/crypto_stream_salsa208.h | 12 ------------ .../include/sodium/crypto_stream_xsalsa20.h | 12 ------------ 8 files changed, 64 deletions(-) diff --git a/src/libsodium/crypto_stream/salsa20/ref/api.h b/src/libsodium/crypto_stream/salsa20/ref/api.h index 8bbb0a2f..3150b270 100644 --- a/src/libsodium/crypto_stream/salsa20/ref/api.h +++ b/src/libsodium/crypto_stream/salsa20/ref/api.h @@ -3,12 +3,8 @@ #define crypto_stream crypto_stream_salsa20 #define crypto_stream_xor crypto_stream_salsa20_xor -#define crypto_stream_beforenm crypto_stream_salsa20_beforenm -#define crypto_stream_afternm crypto_stream_salsa20_afternm -#define crypto_stream_xor_afternm crypto_stream_salsa20_xor_afternm #define crypto_stream_KEYBYTES crypto_stream_salsa20_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_salsa20_NONCEBYTES -#define crypto_stream_BEFORENMBYTES crypto_stream_salsa20_BEFORENMBYTES #define crypto_stream_PRIMITIVE "salsa20" #define crypto_stream_IMPLEMENTATION crypto_stream_salsa20_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_salsa20_VERSION diff --git a/src/libsodium/crypto_stream/salsa2012/ref/api.h b/src/libsodium/crypto_stream/salsa2012/ref/api.h index 051bf1c9..216d529c 100644 --- a/src/libsodium/crypto_stream/salsa2012/ref/api.h +++ b/src/libsodium/crypto_stream/salsa2012/ref/api.h @@ -3,12 +3,8 @@ #define crypto_stream crypto_stream_salsa2012 #define crypto_stream_xor crypto_stream_salsa2012_xor -#define crypto_stream_beforenm crypto_stream_salsa2012_beforenm -#define crypto_stream_afternm crypto_stream_salsa2012_afternm -#define crypto_stream_xor_afternm crypto_stream_salsa2012_xor_afternm #define crypto_stream_KEYBYTES crypto_stream_salsa2012_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_salsa2012_NONCEBYTES -#define crypto_stream_BEFORENMBYTES crypto_stream_salsa2012_BEFORENMBYTES #define crypto_stream_PRIMITIVE "salsa2012" #define crypto_stream_IMPLEMENTATION crypto_stream_salsa2012_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_salsa2012_VERSION diff --git a/src/libsodium/crypto_stream/salsa208/ref/api.h b/src/libsodium/crypto_stream/salsa208/ref/api.h index 9ef0a025..be11510e 100644 --- a/src/libsodium/crypto_stream/salsa208/ref/api.h +++ b/src/libsodium/crypto_stream/salsa208/ref/api.h @@ -3,12 +3,8 @@ #define crypto_stream crypto_stream_salsa208 #define crypto_stream_xor crypto_stream_salsa208_xor -#define crypto_stream_beforenm crypto_stream_salsa208_beforenm -#define crypto_stream_afternm crypto_stream_salsa208_afternm -#define crypto_stream_xor_afternm crypto_stream_salsa208_xor_afternm #define crypto_stream_KEYBYTES crypto_stream_salsa208_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_salsa208_NONCEBYTES -#define crypto_stream_BEFORENMBYTES crypto_stream_salsa208_BEFORENMBYTES #define crypto_stream_PRIMITIVE "salsa208" #define crypto_stream_IMPLEMENTATION crypto_stream_salsa208_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_salsa208_VERSION diff --git a/src/libsodium/crypto_stream/xsalsa20/ref/api.h b/src/libsodium/crypto_stream/xsalsa20/ref/api.h index 2f241ef1..49b84bca 100644 --- a/src/libsodium/crypto_stream/xsalsa20/ref/api.h +++ b/src/libsodium/crypto_stream/xsalsa20/ref/api.h @@ -3,12 +3,8 @@ #define crypto_stream crypto_stream_xsalsa20 #define crypto_stream_xor crypto_stream_xsalsa20_xor -#define crypto_stream_beforenm crypto_stream_xsalsa20_beforenm -#define crypto_stream_afternm crypto_stream_xsalsa20_afternm -#define crypto_stream_xor_afternm crypto_stream_xsalsa20_xor_afternm #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES -#define crypto_stream_BEFORENMBYTES crypto_stream_xsalsa20_BEFORENMBYTES #define crypto_stream_PRIMITIVE "xsalsa20" #define crypto_stream_IMPLEMENTATION crypto_stream_xsalsa20_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_xsalsa20_VERSION diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h index 61b77d3c..f814da02 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h @@ -24,23 +24,11 @@ int crypto_stream_salsa20(unsigned char *,unsigned long long,const unsigned char SODIUM_EXPORT int crypto_stream_salsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); -SODIUM_EXPORT -int crypto_stream_salsa20_beforenm(unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa20_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa20_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - #ifdef __cplusplus } #endif #define crypto_stream_salsa20_ref crypto_stream_salsa20 #define crypto_stream_salsa20_ref_xor crypto_stream_salsa20_xor -#define crypto_stream_salsa20_ref_beforenm crypto_stream_salsa20_beforenm -#define crypto_stream_salsa20_ref_afternm crypto_stream_salsa20_afternm -#define crypto_stream_salsa20_ref_xor_afternm crypto_stream_salsa20_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index 737dd183..e0bd60bd 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -24,23 +24,11 @@ int crypto_stream_salsa2012(unsigned char *,unsigned long long,const unsigned ch SODIUM_EXPORT int crypto_stream_salsa2012_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); -SODIUM_EXPORT -int crypto_stream_salsa2012_beforenm(unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa2012_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa2012_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - #ifdef __cplusplus } #endif #define crypto_stream_salsa2012_ref crypto_stream_salsa2012 #define crypto_stream_salsa2012_ref_xor crypto_stream_salsa2012_xor -#define crypto_stream_salsa2012_ref_beforenm crypto_stream_salsa2012_beforenm -#define crypto_stream_salsa2012_ref_afternm crypto_stream_salsa2012_afternm -#define crypto_stream_salsa2012_ref_xor_afternm crypto_stream_salsa2012_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index fd055525..2447f8dd 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -24,23 +24,11 @@ int crypto_stream_salsa208(unsigned char *,unsigned long long,const unsigned cha SODIUM_EXPORT int crypto_stream_salsa208_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); -SODIUM_EXPORT -int crypto_stream_salsa208_beforenm(unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa208_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_salsa208_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - #ifdef __cplusplus } #endif #define crypto_stream_salsa208_ref crypto_stream_salsa208 #define crypto_stream_salsa208_ref_xor crypto_stream_salsa208_xor -#define crypto_stream_salsa208_ref_beforenm crypto_stream_salsa208_beforenm -#define crypto_stream_salsa208_ref_afternm crypto_stream_salsa208_afternm -#define crypto_stream_salsa208_ref_xor_afternm crypto_stream_salsa208_xor_afternm #endif diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index 2f5859e8..2eed4010 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -24,23 +24,11 @@ int crypto_stream_xsalsa20(unsigned char *,unsigned long long,const unsigned cha SODIUM_EXPORT int crypto_stream_xsalsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); -SODIUM_EXPORT -int crypto_stream_xsalsa20_beforenm(unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_xsalsa20_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - -SODIUM_EXPORT -int crypto_stream_xsalsa20_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *); - #ifdef __cplusplus } #endif #define crypto_stream_xsalsa20_ref crypto_stream_xsalsa20 #define crypto_stream_xsalsa20_ref_xor crypto_stream_xsalsa20_xor -#define crypto_stream_xsalsa20_ref_beforenm crypto_stream_xsalsa20_beforenm -#define crypto_stream_xsalsa20_ref_afternm crypto_stream_xsalsa20_afternm -#define crypto_stream_xsalsa20_ref_xor_afternm crypto_stream_xsalsa20_xor_afternm #endif