From b775e480422ab3488662fcd51370008f007d4eda Mon Sep 17 00:00:00 2001 From: gardners Date: Mon, 19 Dec 2011 08:28:39 +1030 Subject: [PATCH] further NaCl macro name fix for Android cross-compilation. --- rhizome.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rhizome.c b/rhizome.c index fa9d3c7e..2793cf51 100644 --- a/rhizome.c +++ b/rhizome.c @@ -390,7 +390,7 @@ rhizome_manifest *rhizome_read_manifest_file(char *filename) /* Calculate hash of the text part of the file, as we need to couple this with each signature block to */ - unsigned char manifest_hash[crypto_hash_BYTES]; + unsigned char manifest_hash[crypto_hash_sha512_BYTES]; crypto_hash(manifest_hash,m->manifestdata,end_of_text); /* Read signature blocks from file. @@ -594,9 +594,9 @@ int rhizome_store_bundle(rhizome_manifest *m,char *associated_filename) /* Store manifest */ snprintf(sqlcmd,1024,"INSERT INTO MANIFESTS(id,manifest,version,privatekey,inserttime) VALUES('%s',?,%lld,'%s',%lld);", - rhizome_safe_encode(m->cryptoSignPublic,crypto_sign_PUBLICKEYBYTES), + rhizome_safe_encode(m->cryptoSignPublic,crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES), m->version, - rhizome_safe_encode(m->cryptoSignSecret,crypto_sign_SECRETKEYBYTES), + rhizome_safe_encode(m->cryptoSignSecret,crypto_sign_edwards25519sha512batch_SECRETKEYBYTES), overlay_time_in_ms()); sqlite3_stmt *statement; if (sqlite3_prepare_v2(rhizome_db,sqlcmd,strlen(sqlcmd)+1,&statement,&cmdtail)