From 184193d1c599fdda640e915bc9b7d85d464c8b25 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 13 May 2014 13:47:13 -0700 Subject: [PATCH] Kill implementation-specific macros --- .../include/sodium/crypto_box_curve25519xsalsa20poly1305.h | 7 ------- src/libsodium/include/sodium/crypto_core_hsalsa20.h | 2 -- src/libsodium/include/sodium/crypto_core_salsa20.h | 2 -- src/libsodium/include/sodium/crypto_core_salsa2012.h | 2 -- src/libsodium/include/sodium/crypto_core_salsa208.h | 2 -- src/libsodium/include/sodium/crypto_generichash_blake2b.h | 5 ----- src/libsodium/include/sodium/crypto_hash_sha256.h | 2 -- src/libsodium/include/sodium/crypto_hash_sha512.h | 2 -- .../include/sodium/crypto_secretbox_xsalsa20poly1305.h | 3 --- src/libsodium/include/sodium/crypto_shorthash_siphash24.h | 2 -- src/libsodium/include/sodium/crypto_sign_ed25519.h | 5 ----- .../include/sodium/crypto_sign_edwards25519sha512batch.h | 4 ---- src/libsodium/include/sodium/crypto_stream_aes128ctr.h | 6 ------ src/libsodium/include/sodium/crypto_stream_aes256estream.h | 6 ------ src/libsodium/include/sodium/crypto_stream_salsa2012.h | 3 --- src/libsodium/include/sodium/crypto_stream_salsa208.h | 3 --- src/libsodium/include/sodium/crypto_stream_xsalsa20.h | 3 --- src/libsodium/include/sodium/crypto_verify_16.h | 2 -- src/libsodium/include/sodium/crypto_verify_32.h | 2 -- src/libsodium/include/sodium/crypto_verify_64.h | 2 -- 20 files changed, 65 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index 8e05781a..54e73005 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -83,11 +83,4 @@ int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m, } #endif -#define crypto_box_curve25519xsalsa20poly1305_ref crypto_box_curve25519xsalsa20poly1305 -#define crypto_box_curve25519xsalsa20poly1305_ref_open crypto_box_curve25519xsalsa20poly1305_open -#define crypto_box_curve25519xsalsa20poly1305_ref_keypair crypto_box_curve25519xsalsa20poly1305_keypair -#define crypto_box_curve25519xsalsa20poly1305_ref_beforenm crypto_box_curve25519xsalsa20poly1305_beforenm -#define crypto_box_curve25519xsalsa20poly1305_ref_afternm crypto_box_curve25519xsalsa20poly1305_afternm -#define crypto_box_curve25519xsalsa20poly1305_ref_open_afternm crypto_box_curve25519xsalsa20poly1305_open_afternm - #endif diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h index 0c4c623c..82e475b8 100644 --- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h +++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h @@ -32,6 +32,4 @@ int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in, } #endif -#define crypto_core_hsalsa20_ref2 crypto_core_hsalsa20 - #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h index 1cc666aa..160cc56d 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa20.h +++ b/src/libsodium/include/sodium/crypto_core_salsa20.h @@ -32,6 +32,4 @@ int crypto_core_salsa20(unsigned char *out, const unsigned char *in, } #endif -#define crypto_core_salsa20_ref crypto_core_salsa20 - #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h index 9a60aa18..bdd5f9fd 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h @@ -32,6 +32,4 @@ int crypto_core_salsa2012(unsigned char *out, const unsigned char *in, } #endif -#define crypto_core_salsa2012_ref crypto_core_salsa2012 - #endif diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 1d9134b5..3c13efa4 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -32,6 +32,4 @@ int crypto_core_salsa208(unsigned char *out, const unsigned char *in, } #endif -#define crypto_core_salsa208_ref crypto_core_salsa208 - #endif diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h index e46e8900..df1771f6 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -104,9 +104,4 @@ int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state, } #endif -#define crypto_generichash_blake2b_ref crypto_generichash_blake2b -#define crypto_generichash_blake2b_ref_init crypto_generichash_blake2b_init -#define crypto_generichash_blake2b_ref_update crypto_generichash_blake2b_update -#define crypto_generichash_blake2b_ref_final crypto_generichash_blake2b_final - #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index c307db29..7ff85e62 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -44,6 +44,4 @@ int crypto_hash_sha256_final(crypto_hash_sha256_state *state, } #endif -#define crypto_hash_sha256_cp crypto_hash_sha256 - #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index 45e29b19..1e419f7e 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -44,6 +44,4 @@ int crypto_hash_sha512_final(crypto_hash_sha512_state *state, } #endif -#define crypto_hash_sha512_cp crypto_hash_sha512 - #endif diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index 50d08d2f..4afc2cdf 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -51,7 +51,4 @@ int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m, } #endif -#define crypto_secretbox_xsalsa20poly1305_ref crypto_secretbox_xsalsa20poly1305 -#define crypto_secretbox_xsalsa20poly1305_ref_open crypto_secretbox_xsalsa20poly1305_open - #endif diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h index 723cabbf..a2cab0c1 100644 --- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h @@ -27,6 +27,4 @@ int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in, } #endif -#define crypto_shorthash_siphash24_ref crypto_shorthash_siphash24 - #endif diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h index 40fe8618..5f88d61c 100644 --- a/src/libsodium/include/sodium/crypto_sign_ed25519.h +++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h @@ -48,9 +48,4 @@ int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk, } #endif -#define crypto_sign_ed25519_ref10 crypto_sign_ed25519 -#define crypto_sign_ed25519_ref10_open crypto_sign_ed25519_open -#define crypto_sign_ed25519_ref10_keypair crypto_sign_ed25519_keypair -#define crypto_sign_ed25519_ref10_seed_keypair crypto_sign_ed25519_seed_keypair - #endif diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h index bf0d351a..c0f595bf 100644 --- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h @@ -45,8 +45,4 @@ int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk, } #endif -#define crypto_sign_edwards25519sha512batch_ref crypto_sign_edwards25519sha512batch -#define crypto_sign_edwards25519sha512batch_ref_open crypto_sign_edwards25519sha512batch_open -#define crypto_sign_edwards25519sha512batch_ref_keypair crypto_sign_edwards25519sha512batch_keypair - #endif diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h index 295a6c94..29133196 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h @@ -57,10 +57,4 @@ int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char } #endif -#define crypto_stream_aes128ctr_portable crypto_stream_aes128ctr -#define crypto_stream_aes128ctr_portable_xor crypto_stream_aes128ctr_xor -#define crypto_stream_aes128ctr_portable_beforenm crypto_stream_aes128ctr_beforenm -#define crypto_stream_aes128ctr_portable_afternm crypto_stream_aes128ctr_afternm -#define crypto_stream_aes128ctr_portable_xor_afternm crypto_stream_aes128ctr_xor_afternm - #endif diff --git a/src/libsodium/include/sodium/crypto_stream_aes256estream.h b/src/libsodium/include/sodium/crypto_stream_aes256estream.h index 5facce5d..c569b7af 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes256estream.h +++ b/src/libsodium/include/sodium/crypto_stream_aes256estream.h @@ -59,10 +59,4 @@ int crypto_stream_aes256estream_xor_afternm(unsigned char *out, const unsigned c } #endif -#define crypto_stream_aes256estream_hongjun crypto_stream_aes256estream -#define crypto_stream_aes256estream_hongjun_xor crypto_stream_aes256estream_xor -#define crypto_stream_aes256estream_hongjun_beforenm crypto_stream_aes256estream_beforenm -#define crypto_stream_aes256estream_hongjun_afternm crypto_stream_aes256estream_afternm -#define crypto_stream_aes256estream_hongjun_xor_afternm crypto_stream_aes256estream_xor_afternm - #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index db9e79b1..6fcf436f 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -40,7 +40,4 @@ int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m, } #endif -#define crypto_stream_salsa2012_ref crypto_stream_salsa2012 -#define crypto_stream_salsa2012_ref_xor crypto_stream_salsa2012_xor - #endif diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index 1865eda6..a8fd2cef 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -40,7 +40,4 @@ int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m, } #endif -#define crypto_stream_salsa208_ref crypto_stream_salsa208 -#define crypto_stream_salsa208_ref_xor crypto_stream_salsa208_xor - #endif diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index 49783532..f7ea1449 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -40,7 +40,4 @@ int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m, } #endif -#define crypto_stream_xsalsa20_ref crypto_stream_xsalsa20 -#define crypto_stream_xsalsa20_ref_xor crypto_stream_xsalsa20_xor - #endif diff --git a/src/libsodium/include/sodium/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h index 1ead16e4..7370b15f 100644 --- a/src/libsodium/include/sodium/crypto_verify_16.h +++ b/src/libsodium/include/sodium/crypto_verify_16.h @@ -15,8 +15,6 @@ size_t crypto_verify_16_bytes(void); SODIUM_EXPORT int crypto_verify_16(const unsigned char *x, const unsigned char *y); -#define crypto_verify_16_ref crypto_verify_16 - #ifdef __cplusplus } #endif diff --git a/src/libsodium/include/sodium/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h index 59a3ba67..58e4d0e8 100644 --- a/src/libsodium/include/sodium/crypto_verify_32.h +++ b/src/libsodium/include/sodium/crypto_verify_32.h @@ -15,8 +15,6 @@ size_t crypto_verify_32_bytes(void); SODIUM_EXPORT int crypto_verify_32(const unsigned char *x, const unsigned char *y); -#define crypto_verify_32_ref crypto_verify_32 - #ifdef __cplusplus } #endif diff --git a/src/libsodium/include/sodium/crypto_verify_64.h b/src/libsodium/include/sodium/crypto_verify_64.h index bd42dc34..7ed9c89f 100644 --- a/src/libsodium/include/sodium/crypto_verify_64.h +++ b/src/libsodium/include/sodium/crypto_verify_64.h @@ -15,8 +15,6 @@ size_t crypto_verify_64_bytes(void); SODIUM_EXPORT int crypto_verify_64(const unsigned char *x, const unsigned char *y); -#define crypto_verify_64_ref crypto_verify_64 - #ifdef __cplusplus } #endif