From c2b9f75fccd7310e1bed9e5732556ef33152ab81 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Thu, 21 Nov 2013 12:14:02 +1030 Subject: [PATCH] Deprecate RHIZOME_MANIFEST_ID_... in favour of RHIZOME_BUNDLE_ID_... --- rhizome.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rhizome.h b/rhizome.h index 7b171a15..26c5a8d1 100644 --- a/rhizome.h +++ b/rhizome.h @@ -37,17 +37,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # endif #endif -// TODO Rename MANIFEST_ID to BUNDLE_ID -#define RHIZOME_MANIFEST_ID_BYTES crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES -#define RHIZOME_MANIFEST_ID_STRLEN (RHIZOME_MANIFEST_ID_BYTES * 2) -#define RHIZOME_BUNDLE_KEY_BYTES (crypto_sign_edwards25519sha512batch_SECRETKEYBYTES-crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES) -#define RHIZOME_BUNDLE_KEY_STRLEN (RHIZOME_BUNDLE_KEY_BYTES * 2) +#define RHIZOME_BUNDLE_ID_BYTES crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES +#define RHIZOME_BUNDLE_ID_STRLEN (RHIZOME_BUNDLE_ID_BYTES * 2) +#define RHIZOME_BUNDLE_KEY_BYTES (crypto_sign_edwards25519sha512batch_SECRETKEYBYTES - crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES) +#define RHIZOME_BUNDLE_KEY_STRLEN (RHIZOME_BUNDLE_KEY_BYTES * 2) #define RHIZOME_FILEHASH_BYTES SHA512_DIGEST_LENGTH #define RHIZOME_FILEHASH_STRLEN (RHIZOME_FILEHASH_BYTES * 2) #define RHIZOME_CRYPT_KEY_BYTES crypto_stream_xsalsa20_ref_KEYBYTES #define RHIZOME_CRYPT_KEY_STRLEN (RHIZOME_CRYPT_KEY_BYTES * 2) +// TODO Rename MANIFEST_ID to BUNDLE_ID +// The following constants are deprecated, use the BUNDLE_ID forms instead +#define RHIZOME_MANIFEST_ID_BYTES RHIZOME_BUNDLE_ID_BYTES +#define RHIZOME_MANIFEST_ID_STRLEN RHIZOME_BUNDLE_ID_STRLEN + // assumed to always be 2^n #define RHIZOME_CRYPT_PAGE_SIZE 4096