From cdd79653f3684b75e40ea03e373f8254aee7fc06 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 13 May 2014 00:01:44 -0700 Subject: [PATCH] Remove unused macros --- src/libsodium/crypto_auth/hmacsha256/cp/api.h | 1 - src/libsodium/crypto_auth/hmacsha512/cp/api.h | 1 - src/libsodium/crypto_auth/hmacsha512256/cp/api.h | 1 - src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h | 1 - src/libsodium/crypto_core/hsalsa20/ref2/api.h | 1 - src/libsodium/crypto_core/salsa20/ref/api.h | 1 - src/libsodium/crypto_core/salsa2012/ref/api.h | 1 - src/libsodium/crypto_core/salsa208/ref/api.h | 1 - src/libsodium/crypto_hash/sha256/cp/api.h | 1 - src/libsodium/crypto_hash/sha512/cp/api.h | 1 - src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h | 1 - src/libsodium/crypto_shorthash/siphash24/ref/api.h | 1 - src/libsodium/crypto_sign/ed25519/ref10/api.h | 1 - src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h | 1 - src/libsodium/crypto_stream/aes128ctr/portable/api.h | 1 - src/libsodium/crypto_stream/aes256estream/hongjun/api.h | 1 - src/libsodium/crypto_stream/salsa2012/ref/api.h | 1 - src/libsodium/crypto_stream/salsa208/ref/api.h | 1 - src/libsodium/crypto_stream/xsalsa20/ref/api.h | 1 - 19 files changed, 19 deletions(-) diff --git a/src/libsodium/crypto_auth/hmacsha256/cp/api.h b/src/libsodium/crypto_auth/hmacsha256/cp/api.h index 46fcdb60..cd4d38e7 100644 --- a/src/libsodium/crypto_auth/hmacsha256/cp/api.h +++ b/src/libsodium/crypto_auth/hmacsha256/cp/api.h @@ -5,6 +5,5 @@ #define crypto_auth_verify crypto_auth_hmacsha256_verify #define crypto_auth_BYTES crypto_auth_hmacsha256_BYTES #define crypto_auth_KEYBYTES crypto_auth_hmacsha256_KEYBYTES -#define crypto_auth_PRIMITIVE "hmacsha256" #define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha256_IMPLEMENTATION #define crypto_auth_VERSION crypto_auth_hmacsha256_VERSION diff --git a/src/libsodium/crypto_auth/hmacsha512/cp/api.h b/src/libsodium/crypto_auth/hmacsha512/cp/api.h index e8402aa3..0ce40434 100644 --- a/src/libsodium/crypto_auth/hmacsha512/cp/api.h +++ b/src/libsodium/crypto_auth/hmacsha512/cp/api.h @@ -5,6 +5,5 @@ #define crypto_auth_verify crypto_auth_hmacsha512_verify #define crypto_auth_BYTES crypto_auth_hmacsha512_BYTES #define crypto_auth_KEYBYTES crypto_auth_hmacsha512_KEYBYTES -#define crypto_auth_PRIMITIVE "hmacsha512" #define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha512_IMPLEMENTATION #define crypto_auth_VERSION crypto_auth_hmacsha512_VERSION diff --git a/src/libsodium/crypto_auth/hmacsha512256/cp/api.h b/src/libsodium/crypto_auth/hmacsha512256/cp/api.h index f0331271..645b2781 100644 --- a/src/libsodium/crypto_auth/hmacsha512256/cp/api.h +++ b/src/libsodium/crypto_auth/hmacsha512256/cp/api.h @@ -5,6 +5,5 @@ #define crypto_auth_verify crypto_auth_hmacsha512256_verify #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES -#define crypto_auth_PRIMITIVE "hmacsha512256" #define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha512256_IMPLEMENTATION #define crypto_auth_VERSION crypto_auth_hmacsha512256_VERSION diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h index 394a75ec..aa39d90f 100644 --- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h +++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h @@ -14,6 +14,5 @@ #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES #define crypto_box_BOXZEROBYTES crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES #define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES) -#define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305" #define crypto_box_IMPLEMENTATION crypto_box_curve25519xsalsa20poly1305_IMPLEMENTATION #define crypto_box_VERSION crypto_box_curve25519xsalsa20poly1305_VERSION diff --git a/src/libsodium/crypto_core/hsalsa20/ref2/api.h b/src/libsodium/crypto_core/hsalsa20/ref2/api.h index e7866bac..582cba65 100644 --- a/src/libsodium/crypto_core/hsalsa20/ref2/api.h +++ b/src/libsodium/crypto_core/hsalsa20/ref2/api.h @@ -6,6 +6,5 @@ #define crypto_core_INPUTBYTES crypto_core_hsalsa20_INPUTBYTES #define crypto_core_KEYBYTES crypto_core_hsalsa20_KEYBYTES #define crypto_core_CONSTBYTES crypto_core_hsalsa20_CONSTBYTES -#define crypto_core_PRIMITIVE "hsalsa20" #define crypto_core_IMPLEMENTATION crypto_core_hsalsa20_IMPLEMENTATION #define crypto_core_VERSION crypto_core_hsalsa20_VERSION diff --git a/src/libsodium/crypto_core/salsa20/ref/api.h b/src/libsodium/crypto_core/salsa20/ref/api.h index d800a1ed..d34ddeb4 100644 --- a/src/libsodium/crypto_core/salsa20/ref/api.h +++ b/src/libsodium/crypto_core/salsa20/ref/api.h @@ -6,6 +6,5 @@ #define crypto_core_INPUTBYTES crypto_core_salsa20_INPUTBYTES #define crypto_core_KEYBYTES crypto_core_salsa20_KEYBYTES #define crypto_core_CONSTBYTES crypto_core_salsa20_CONSTBYTES -#define crypto_core_PRIMITIVE "salsa20" #define crypto_core_IMPLEMENTATION crypto_core_salsa20_IMPLEMENTATION #define crypto_core_VERSION crypto_core_salsa20_VERSION diff --git a/src/libsodium/crypto_core/salsa2012/ref/api.h b/src/libsodium/crypto_core/salsa2012/ref/api.h index 3e27241d..76919a0c 100644 --- a/src/libsodium/crypto_core/salsa2012/ref/api.h +++ b/src/libsodium/crypto_core/salsa2012/ref/api.h @@ -6,6 +6,5 @@ #define crypto_core_INPUTBYTES crypto_core_salsa2012_INPUTBYTES #define crypto_core_KEYBYTES crypto_core_salsa2012_KEYBYTES #define crypto_core_CONSTBYTES crypto_core_salsa2012_CONSTBYTES -#define crypto_core_PRIMITIVE "salsa2012" #define crypto_core_IMPLEMENTATION crypto_core_salsa2012_IMPLEMENTATION #define crypto_core_VERSION crypto_core_salsa2012_VERSION diff --git a/src/libsodium/crypto_core/salsa208/ref/api.h b/src/libsodium/crypto_core/salsa208/ref/api.h index 1172a352..07d090b3 100644 --- a/src/libsodium/crypto_core/salsa208/ref/api.h +++ b/src/libsodium/crypto_core/salsa208/ref/api.h @@ -6,6 +6,5 @@ #define crypto_core_INPUTBYTES crypto_core_salsa208_INPUTBYTES #define crypto_core_KEYBYTES crypto_core_salsa208_KEYBYTES #define crypto_core_CONSTBYTES crypto_core_salsa208_CONSTBYTES -#define crypto_core_PRIMITIVE "salsa208" #define crypto_core_IMPLEMENTATION crypto_core_salsa208_IMPLEMENTATION #define crypto_core_VERSION crypto_core_salsa208_VERSION diff --git a/src/libsodium/crypto_hash/sha256/cp/api.h b/src/libsodium/crypto_hash/sha256/cp/api.h index b04cff9c..b38a563a 100644 --- a/src/libsodium/crypto_hash/sha256/cp/api.h +++ b/src/libsodium/crypto_hash/sha256/cp/api.h @@ -6,6 +6,5 @@ #define crypto_hash_update crypto_hash_sha256_update #define crypto_hash_final crypto_hash_sha256_final #define crypto_hash_BYTES crypto_hash_sha256_BYTES -#define crypto_hash_PRIMITIVE "sha256" #define crypto_hash_IMPLEMENTATION crypto_hash_sha256_IMPLEMENTATION #define crypto_hash_VERSION crypto_hash_sha256_VERSION diff --git a/src/libsodium/crypto_hash/sha512/cp/api.h b/src/libsodium/crypto_hash/sha512/cp/api.h index 5e01170d..c3a31883 100644 --- a/src/libsodium/crypto_hash/sha512/cp/api.h +++ b/src/libsodium/crypto_hash/sha512/cp/api.h @@ -6,6 +6,5 @@ #define crypto_hash_update crypto_hash_sha512_update #define crypto_hash_final crypto_hash_sha512_final #define crypto_hash_BYTES crypto_hash_sha512_BYTES -#define crypto_hash_PRIMITIVE "sha512" #define crypto_hash_IMPLEMENTATION crypto_hash_sha512_IMPLEMENTATION #define crypto_hash_VERSION crypto_hash_sha512_VERSION diff --git a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h index a4920ddd..5eff3d29 100644 --- a/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h +++ b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h @@ -7,6 +7,5 @@ #define crypto_secretbox_NONCEBYTES crypto_secretbox_xsalsa20poly1305_NONCEBYTES #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES #define crypto_secretbox_BOXZEROBYTES crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES -#define crypto_secretbox_PRIMITIVE "xsalsa20poly1305" #define crypto_secretbox_IMPLEMENTATION crypto_secretbox_xsalsa20poly1305_IMPLEMENTATION #define crypto_secretbox_VERSION crypto_secretbox_xsalsa20poly1305_VERSION diff --git a/src/libsodium/crypto_shorthash/siphash24/ref/api.h b/src/libsodium/crypto_shorthash/siphash24/ref/api.h index 55cc26fe..a837c8af 100644 --- a/src/libsodium/crypto_shorthash/siphash24/ref/api.h +++ b/src/libsodium/crypto_shorthash/siphash24/ref/api.h @@ -3,6 +3,5 @@ #define crypto_shorthash crypto_shorthash_siphash24 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES -#define crypto_shorthash_PRIMITIVE "siphash24" #define crypto_shorthash_IMPLEMENTATION crypto_shorthash_siphash24_IMPLEMENTATION #define crypto_shorthash_VERSION crypto_shorthash_siphash24_VERSION diff --git a/src/libsodium/crypto_sign/ed25519/ref10/api.h b/src/libsodium/crypto_sign/ed25519/ref10/api.h index 74309f7e..a5c50313 100644 --- a/src/libsodium/crypto_sign/ed25519/ref10/api.h +++ b/src/libsodium/crypto_sign/ed25519/ref10/api.h @@ -9,6 +9,5 @@ #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES -#define crypto_sign_PRIMITIVE "ed25519" #define crypto_sign_IMPLEMENTATION crypto_sign_ed25519_IMPLEMENTATION #define crypto_sign_VERSION crypto_sign_ed25519_VERSION diff --git a/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h index 1217a582..5cb0f760 100644 --- a/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h +++ b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h @@ -7,7 +7,6 @@ #define crypto_sign_BYTES crypto_sign_edwards25519sha512batch_BYTES #define crypto_sign_PUBLICKEYBYTES crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES #define crypto_sign_SECRETKEYBYTES crypto_sign_edwards25519sha512batch_SECRETKEYBYTES -#define crypto_sign_PRIMITIVE "edwards25519sha512batch" #define crypto_sign_IMPLEMENTATION crypto_sign_edwards25519sha512batch_IMPLEMENTATION #define crypto_sign_VERSION crypto_sign_edwards25519sha512batch_VERSION diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/api.h b/src/libsodium/crypto_stream/aes128ctr/portable/api.h index bc951d13..3c53fb95 100644 --- a/src/libsodium/crypto_stream/aes128ctr/portable/api.h +++ b/src/libsodium/crypto_stream/aes128ctr/portable/api.h @@ -9,6 +9,5 @@ #define crypto_stream_KEYBYTES crypto_stream_aes128ctr_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_aes128ctr_NONCEBYTES #define crypto_stream_BEFORENMBYTES crypto_stream_aes128ctr_BEFORENMBYTES -#define crypto_stream_PRIMITIVE "aes128ctr" #define crypto_stream_IMPLEMENTATION crypto_stream_aes128ctr_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_aes128ctr_VERSION diff --git a/src/libsodium/crypto_stream/aes256estream/hongjun/api.h b/src/libsodium/crypto_stream/aes256estream/hongjun/api.h index 45243be9..017babe9 100644 --- a/src/libsodium/crypto_stream/aes256estream/hongjun/api.h +++ b/src/libsodium/crypto_stream/aes256estream/hongjun/api.h @@ -9,6 +9,5 @@ #define crypto_stream_KEYBYTES crypto_stream_aes256estream_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_aes256estream_NONCEBYTES #define crypto_stream_BEFORENMBYTES crypto_stream_aes256estream_BEFORENMBYTES -#define crypto_stream_PRIMITIVE "aes256estream" #define crypto_stream_IMPLEMENTATION crypto_stream_aes256estream_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_aes256estream_VERSION diff --git a/src/libsodium/crypto_stream/salsa2012/ref/api.h b/src/libsodium/crypto_stream/salsa2012/ref/api.h index 216d529c..0efe8b8a 100644 --- a/src/libsodium/crypto_stream/salsa2012/ref/api.h +++ b/src/libsodium/crypto_stream/salsa2012/ref/api.h @@ -5,7 +5,6 @@ #define crypto_stream_xor crypto_stream_salsa2012_xor #define crypto_stream_KEYBYTES crypto_stream_salsa2012_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_salsa2012_NONCEBYTES -#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 be11510e..14b4a775 100644 --- a/src/libsodium/crypto_stream/salsa208/ref/api.h +++ b/src/libsodium/crypto_stream/salsa208/ref/api.h @@ -5,6 +5,5 @@ #define crypto_stream_xor crypto_stream_salsa208_xor #define crypto_stream_KEYBYTES crypto_stream_salsa208_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_salsa208_NONCEBYTES -#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 49b84bca..58915f31 100644 --- a/src/libsodium/crypto_stream/xsalsa20/ref/api.h +++ b/src/libsodium/crypto_stream/xsalsa20/ref/api.h @@ -5,7 +5,6 @@ #define crypto_stream_xor crypto_stream_xsalsa20_xor #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES -#define crypto_stream_PRIMITIVE "xsalsa20" #define crypto_stream_IMPLEMENTATION crypto_stream_xsalsa20_IMPLEMENTATION #define crypto_stream_VERSION crypto_stream_xsalsa20_VERSION