ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 13:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51540a3017
serval-dna/rhizome_crypto.c

665 lines
24 KiB
C
Raw Normal View History

Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
/*
Serval Distributed Numbering Architecture (DNA)
Copyright (C) 2010 Paul Gardner-Stephen
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
#include <stdlib.h>
#include <ctype.h>
#include <assert.h>
Improve debug logging - add debug.trace to help track down segfaults - warn about alarms without names (which are then hard to track down).
2013-02-15 19:52:37 +00:00
#include "crypto_sign_edwards25519sha512batch.h"
#include "nacl/src/crypto_sign_edwards25519sha512batch_ref/ge.h"
Renamed mphlr.h to serval.h (also some temporary debugging has been added in some places)
2012-02-23 02:15:42 +00:00
#include "serval.h"
Overhaul debug flags Replace debugflags_t and DEBUG_XXX bit masks with config schema "debug.xxx" entries. No more support for "debug.all".
2012-12-11 05:29:46 +00:00
#include "conf.h"
Refactor string functions, add str_fromprint() Move lots of non-Serval-specific string functions from "serval.h"/dataformats.c to "str.h"/str.c. Add str_fromprint() function that reverses the effect of toprint(): interprets escape sequences in the source string "\n\t\r\0\xHH\\" and replaces them with a single char in the destination string.
2012-11-07 06:12:45 +00:00
#include "str.h"
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
#include "rhizome.h"
Add API to generate public key from private key
2013-07-25 05:10:59 +00:00
#include "crypto.h"
Create keyring.h and move definitions there
2013-10-16 03:00:00 +00:00
#include "keyring.h"
Refactor dataformats into separate header
2013-11-25 02:39:54 +00:00
#include "dataformats.h"
Add "rhizome extract manifest" command
2012-05-02 06:33:09 +00:00
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
int rhizome_manifest_createid(rhizome_manifest *m)
{
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
if (crypto_sign_edwards25519sha512batch_keypair(m->cryptoSignPublic.binary, m->cryptoSignSecret))
Add API to generate public key from private key
2013-07-25 05:10:59 +00:00
return WHY("Failed to create keypair for manifest ID.");
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
rhizome_manifest_set_id(m, &m->cryptoSignPublic);
Add "rhizome add file" --force-new option Overrides the default behaviour of de-duplicating added manifests New 'rhizomeops' test case: AddForceDuplicate
2013-09-30 07:12:25 +00:00
m->haveSecret = NEW_BUNDLE_ID;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
// A new Bundle ID and secret invalidates any existing BK field.
rhizome_manifest_del_bundle_key(m);
Add API to generate public key from private key
2013-07-25 05:10:59 +00:00
return 0;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
struct signing_key{
unsigned char Private[crypto_sign_edwards25519sha512batch_SECRETKEYBYTES];
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
rhizome_bid_t Public;
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
};
/* generate a keypair from a given seed string */
static int generate_keypair(const char *seed, struct signing_key *key)
{
unsigned char hash[crypto_hash_sha512_BYTES];
crypto_hash_sha512(hash, (unsigned char *)seed, strlen(seed));
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
// The first 256 bits (32 bytes) of the hash will be used as the private key of the BID.
bcopy(hash, key->Private, sizeof key->Private);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (crypto_sign_compute_public_key(key->Private, key->Public.binary) == -1)
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
return WHY("Could not generate public key");
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
// The last 32 bytes of the private key should be identical to the public key. This is what
// crypto_sign_edwards25519sha512batch_keypair() returns, and there is code that depends on it.
// TODO: Refactor the Rhizome private/public keypair to eliminate this duplication.
bcopy(key->Public.binary, key->Private + RHIZOME_BUNDLE_KEY_BYTES, sizeof key->Public.binary);
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
return 0;
}
/* Generate a bundle id deterministically from the given seed.
* Then either fetch it from the database or initialise a new empty manifest */
int rhizome_get_bundle_from_seed(rhizome_manifest *m, const char *seed)
{
struct signing_key key;
if (generate_keypair(seed, &key))
return -1;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
int ret = rhizome_retrieve_manifest(&key.Public, m);
Use size_t in Rhizome store functions
2013-10-17 12:47:41 +00:00
if (ret == -1)
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
return -1;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (ret == 1) {
// manifest not retrieved
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
rhizome_manifest_set_id(m, &key.Public); // zerofills m->cryptoSignSecret
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->haveSecret = NEW_BUNDLE_ID;
} else {
m->haveSecret = EXISTING_BUNDLE_ID;
}
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
bcopy(key.Private, m->cryptoSignSecret, sizeof m->cryptoSignSecret);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
// Disabled for performance, these asserts should nevertheless always hold.
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
//assert(cmp_rhizome_bid_t(&m->cryptoSignPublic, &key.Public) == 0);
//assert(memcmp(m->cryptoSignPublic.binary, m->cryptoSignSecret + RHIZOME_BUNDLE_KEY_BYTES, sizeof m->cryptoSignPublic.binary) == 0);
Add API to create bundles with deterministic ID's
2013-07-25 05:16:34 +00:00
return ret;
}
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
/* Given a Rhizome Secret (RS) and bundle ID (BID), XOR a bundle key 'bkin' (private or public) with
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
* RS##BID. This derives the first 32-bytes of the secret key. The BID itself as
* public key is also the last 32-bytes of the secret key.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
* @author Andrew Bettison <andrew@servalproject.org>
* @author Paul Gardner-Stephen <paul@servalproject.org>
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*/
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
int rhizome_bk_xor_stream(
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
const rhizome_bid_t *bidp,
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
const unsigned char *rs,
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
const size_t rs_len,
unsigned char *xor_stream,
int xor_stream_byte_count)
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
{
IN();
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
if (rs_len<1||rs_len>65536) RETURN(WHY("rs_len invalid"));
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
if (xor_stream_byte_count<1||xor_stream_byte_count>crypto_hash_sha512_BYTES)
RETURN(WHY("xor_stream_byte_count invalid"));
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
int combined_len = rs_len + crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
unsigned char buffer[combined_len];
bcopy(&rs[0], &buffer[0], rs_len);
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
bcopy(&bidp->binary[0], &buffer[rs_len], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
unsigned char hash[crypto_hash_sha512_BYTES];
crypto_hash_sha512(hash,buffer,combined_len);
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
bcopy(hash,xor_stream,xor_stream_byte_count);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
return 0;
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* CryptoSign Secret Keys in cupercop-20120525 onwards have the public key as the second half of the
* secret key. The public key is the BID, so this simplifies the BK<-->SECRET conversion processes.
*
* Returns 0 if the BK decodes correctly to the bundle secret, 1 if not. Returns -1 if there is an
* error.
*/
Fix -Wunused-parameter warnings New UNUSED(param) macro suppresses the warning for a specific parameter In some cases, removed the unused parameters. In others, used the parameter in a DEBUGF() or assert() statement to document the intent.
2013-12-09 07:52:18 +00:00
int rhizome_bk2secret(
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
const rhizome_bid_t *bidp,
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
const unsigned char *rs, const size_t rs_len,
/* The BK need only be the length of the secret half of the secret key */
const unsigned char bkin[RHIZOME_BUNDLE_KEY_BYTES],
unsigned char secret[crypto_sign_edwards25519sha512batch_SECRETKEYBYTES]
)
{
IN();
unsigned char xor_stream[RHIZOME_BUNDLE_KEY_BYTES];
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (rhizome_bk_xor_stream(bidp, rs, rs_len, xor_stream, RHIZOME_BUNDLE_KEY_BYTES))
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
RETURN(WHY("rhizome_bk_xor_stream() failed"));
/* XOR and store secret part of secret key */
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
unsigned i;
for (i = 0; i != RHIZOME_BUNDLE_KEY_BYTES; ++i)
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
secret[i] = bkin[i] ^ xor_stream[i];
bzero(xor_stream, sizeof xor_stream);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Copy BID as public-key part of secret key */
bcopy(bidp->binary, secret + RHIZOME_BUNDLE_KEY_BYTES, sizeof bidp->binary);
RETURN(rhizome_verify_bundle_privatekey(secret, bidp->binary) ? 0 : 1);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
}
int rhizome_secret2bk(
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
const rhizome_bid_t *bidp,
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
const unsigned char *rs, const size_t rs_len,
/* The BK need only be the length of the secret half of the secret key */
unsigned char bkout[RHIZOME_BUNDLE_KEY_BYTES],
const unsigned char secret[crypto_sign_edwards25519sha512batch_SECRETKEYBYTES]
)
{
IN();
unsigned char xor_stream[RHIZOME_BUNDLE_KEY_BYTES];
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
if (rhizome_bk_xor_stream(bidp,rs,rs_len,xor_stream,RHIZOME_BUNDLE_KEY_BYTES))
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
RETURN(WHY("rhizome_bk_xor_stream() failed"));
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
int i;
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
/* XOR and store secret part of secret key */
for(i = 0; i != RHIZOME_BUNDLE_KEY_BYTES; i++)
bkout[i] = secret[i] ^ xor_stream[i];
bzero(xor_stream, sizeof xor_stream);
RETURN(0);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
}
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Given a SID, search the keyring for an identity with the same SID and return its Rhizome secret
* if found.
*
* Returns FOUND_RHIZOME_SECRET if the author's rhizome secret is found; '*rs' is set to point to
* the secret key in the keyring, and '*rs_len' is set to the key length.
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* Returns IDENTITY_NOT_FOUND if the SID is not in the keyring.
*
* Returns IDENTITY_HAS_NO_RHIZOME_SECRET if the SID is in the keyring but has no Rhizome Secret.
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
enum rhizome_secret_disposition find_rhizome_secret(const sid_t *authorSidp, size_t *rs_len, const unsigned char **rs)
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
{
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
IN();
Fix -Wsign-compare warnings in keyring: unsigned cn,in,kp
2013-12-10 06:04:35 +00:00
unsigned cn=0, in=0, kp=0;
Use sid_t everywhere Remove stowSid() at last Change API of tohex() and strbuf_tohex(), to pass string length instead of binary byte count. This allows odd numbers of hex digits to be produced. Remove alloca_tohex_sid(); replace with alloca_tohex_sid_t() New alloca_tohex_sid_t_trunc() macro
2013-10-09 08:24:21 +00:00
if (!keyring_find_sid(keyring,&cn,&in,&kp, authorSidp)) {
Overhaul debug flags Replace debugflags_t and DEBUG_XXX bit masks with config schema "debug.xxx" entries. No more support for "debug.all".
2012-12-11 05:29:46 +00:00
if (config.debug.rhizome)
Use sid_t everywhere Remove stowSid() at last Change API of tohex() and strbuf_tohex(), to pass string length instead of binary byte count. This allows odd numbers of hex digits to be produced. Remove alloca_tohex_sid(); replace with alloca_tohex_sid_t() New alloca_tohex_sid_t_trunc() macro
2013-10-09 08:24:21 +00:00
DEBUGF("identity sid=%s is not in keyring", alloca_tohex_sid_t(*authorSidp));
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(IDENTITY_NOT_FOUND);
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
}
Fix -Wsign-compare warnings in keyring: unsigned cn,in,kp
2013-12-10 06:04:35 +00:00
int kpi = keyring_identity_find_keytype(keyring, cn, in, KEYTYPE_RHIZOME);
if (kpi == -1) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
WARNF("Identity sid=%s has no Rhizome Secret", alloca_tohex_sid_t(*authorSidp));
RETURN(IDENTITY_HAS_NO_RHIZOME_SECRET);
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
}
Fix -Wsign-compare warnings in keyring: unsigned cn,in,kp
2013-12-10 06:04:35 +00:00
kp = (unsigned)kpi;
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
int rslen = keyring->contexts[cn]->identities[in]->keypairs[kp]->private_key_len;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
assert(rslen >= 16);
assert(rslen <= 1024);
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
if (rs_len)
*rs_len = rslen;
if (rs)
*rs = keyring->contexts[cn]->identities[in]->keypairs[kp]->private_key;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(FOUND_RHIZOME_SECRET);
Issue #17, improve speed of "rhizome extract manifest" In the case that the MANIFESTS 'author' column is not NULL, do not perform a full bundle secret verification in order to clear the '.readonly' flag, just check whether the author's SID is present in the keyring with a proper-size rhizome secret.
2012-10-15 08:03:44 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Attempt to authenticate the authorship of the given bundle, and set the 'authorship' element
* accordingly. If the manifest has nk BK field, then no authentication can be performed.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
void rhizome_authenticate_author(rhizome_manifest *m)
{
IN();
if (!m->has_bundle_key)
RETURNVOID;
switch (m->authorship) {
case ANONYMOUS:
rhizome_find_bundle_author_and_secret(m);
break;
case AUTHOR_NOT_CHECKED:
case AUTHOR_LOCAL: {
if (config.debug.rhizome)
DEBUGF("manifest[%d] authenticate author=%s", m->manifest_record_number, alloca_tohex_sid_t(m->author));
size_t rs_len;
const unsigned char *rs;
enum rhizome_secret_disposition d = find_rhizome_secret(&m->author, &rs_len, &rs);
switch (d) {
case FOUND_RHIZOME_SECRET:
if (config.debug.rhizome)
DEBUGF("author has Rhizome secret");
Fix -Wunused-parameter warnings New UNUSED(param) macro suppresses the warning for a specific parameter In some cases, removed the unused parameters. In others, used the parameter in a DEBUGF() or assert() statement to document the intent.
2013-12-09 07:52:18 +00:00
switch (rhizome_bk2secret(&m->cryptoSignPublic, rs, rs_len, m->bundle_key.binary, m->cryptoSignSecret)) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
case 0:
if (config.debug.rhizome)
DEBUGF("authentic");
m->authorship = AUTHOR_AUTHENTIC;
if (!m->haveSecret)
m->haveSecret = EXISTING_BUNDLE_ID;
break;
case -1:
if (config.debug.rhizome)
DEBUGF("error");
m->authorship = AUTHENTICATION_ERROR;
break;
default:
if (config.debug.rhizome)
DEBUGF("impostor");
m->authorship = AUTHOR_IMPOSTOR;
break;
}
break;
case IDENTITY_NOT_FOUND:
if (config.debug.rhizome)
DEBUGF("author not found");
m->authorship = AUTHOR_UNKNOWN;
break;
case IDENTITY_HAS_NO_RHIZOME_SECRET:
if (config.debug.rhizome)
DEBUGF("author has no Rhizome secret");
m->authorship = AUTHENTICATION_ERROR;
break;
default:
FATALF("find_rhizome_secret() returned unknown code %d", (int)d);
break;
}
}
break;
case AUTHENTICATION_ERROR:
case AUTHOR_UNKNOWN:
case AUTHOR_IMPOSTOR:
case AUTHOR_AUTHENTIC:
// work has already been done, don't repeat it
break;
default:
FATALF("m->authorship = %d", (int)m->authorship);
break;
}
OUT();
}
substantial work towards implementing BK field in rhizome manifests.
2012-05-15 07:54:25 +00:00
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* If the given bundle secret key corresponds to the bundle's ID (public key) then store it in the
* manifest structure and mark the secret key as known. Return 1 if the secret key was assigned,
* 0 if not.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* This function should only be called on a manifest that already has a public key (ID) and does
* not have a known secret key.
*
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
* @author Andrew Bettison <andrew@servalproject.com>
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
int rhizome_apply_bundle_secret(rhizome_manifest *m, const rhizome_bk_t *bsk)
BK encoding and decoding complete, but untested.
2012-05-15 10:34:41 +00:00
{
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
IN();
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (config.debug.rhizome)
DEBUGF("manifest[%d] bsk=%s", m->manifest_record_number, bsk ? alloca_tohex_rhizome_bk_t(*bsk) : "NULL");
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
assert(m->haveSecret == SECRET_UNKNOWN);
assert(is_all_matching(m->cryptoSignSecret, sizeof m->cryptoSignSecret, 0));
Use manifest 'has_id' consistently
2013-12-19 08:39:53 +00:00
assert(m->has_id);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
assert(bsk != NULL);
assert(!rhizome_is_bk_none(bsk));
if (rhizome_verify_bundle_privatekey(bsk->binary, m->cryptoSignPublic.binary)) {
if (config.debug.rhizome)
DEBUG("bundle secret verifies ok");
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
bcopy(bsk->binary, m->cryptoSignSecret, sizeof bsk->binary);
bcopy(m->cryptoSignPublic.binary, m->cryptoSignSecret + sizeof bsk->binary, sizeof m->cryptoSignPublic.binary);
Refactor manifest: change haveSecret to enum
2013-10-30 02:44:26 +00:00
m->haveSecret = EXISTING_BUNDLE_ID;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(1);
Issue #17, fix new 'rhizomeops' test Was incorrectly supplying bundle secret to "rhizome add" command.
2012-10-15 03:31:48 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(0);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
}
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
/* Discover if the given manifest was created (signed) by any unlocked identity currently in the
* keyring.
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* This function must only be called if the bundle secret is not known. If it is known, then
* use
*
* If the authorship is already known (ie, not ANONYMOUS) then returns without changing anything.
* That means this function can be called several times on the same manifest, but will only perform
* any work the first time.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* If the manifest has no bundle key (BK) field, then it is anonymous, so leaves 'authorship'
* unchanged and returns.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* If an identity is found in the keyring with permission to alter the bundle, then sets the
* manifest 'authorship' field to AUTHOR_AUTHENTIC, the 'author' field to the SID of the identity,
* the manifest 'cryptoSignSecret' field to the bundle secret key and the 'haveSecret' field to
* EXISTING_BUNDLE_ID.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
* If no identity is found in the keyring that combines with the bundle key (BK) field to yield
* the bundle's secret key, then leaves the manifest 'authorship' field as ANONYMOUS.
*
* If an error occurs, eg, the keyring contains an invalid Rhizome Secret or a cryptographic
* operation fails, then sets the 'authorship' field to AUTHENTICATION_ERROR and leaves the
* 'author', 'haveSecret' and 'cryptoSignSecret' fields unchanged.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
* @author Andrew Bettison <andrew@servalproject.com>
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
void rhizome_find_bundle_author_and_secret(rhizome_manifest *m)
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
{
instrumented various rhizome functions.
2012-06-26 06:32:49 +00:00
IN();
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (m->authorship != ANONYMOUS)
RETURNVOID;
assert(is_sid_t_any(m->author));
if (!m->has_bundle_key)
RETURNVOID;
Fix -Wsign-compare warnings in keyring: unsigned cn,in,kp
2013-12-10 06:04:35 +00:00
unsigned cn = 0, in = 0, kp = 0;
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
for (; keyring_next_identity(keyring, &cn, &in, &kp); ++kp) {
Use sid_t everywhere Remove stowSid() at last Change API of tohex() and strbuf_tohex(), to pass string length instead of binary byte count. This allows odd numbers of hex digits to be produced. Remove alloca_tohex_sid(); replace with alloca_tohex_sid_t() New alloca_tohex_sid_t_trunc() macro
2013-10-09 08:24:21 +00:00
const sid_t *authorSidp = (const sid_t *) keyring->contexts[cn]->identities[in]->keypairs[kp]->public_key;
//if (config.debug.rhizome) DEBUGF("try author identity sid=%s", alloca_tohex_sid_t(*authorSidp));
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
int rkp = keyring_identity_find_keytype(keyring, cn, in, KEYTYPE_RHIZOME);
if (rkp != -1) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
size_t rs_len = keyring->contexts[cn]->identities[in]->keypairs[rkp]->private_key_len;
if (rs_len < 16 || rs_len > 1024) {
WHYF("invalid Rhizome Secret: length=%zu", rs_len);
m->authorship = AUTHENTICATION_ERROR;
RETURNVOID;
}
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
const unsigned char *rs = keyring->contexts[cn]->identities[in]->keypairs[rkp]->private_key;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
unsigned char *secretp = m->cryptoSignSecret;
if (m->haveSecret)
secretp = alloca(sizeof m->cryptoSignSecret);
Fix -Wunused-parameter warnings New UNUSED(param) macro suppresses the warning for a specific parameter In some cases, removed the unused parameters. In others, used the parameter in a DEBUGF() or assert() statement to document the intent.
2013-12-09 07:52:18 +00:00
if (rhizome_bk2secret(&m->cryptoSignPublic, rs, rs_len, m->bundle_key.binary, secretp) == 0) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (m->haveSecret) {
if (memcmp(secretp, m->cryptoSignSecret, sizeof m->cryptoSignSecret) != 0)
FATALF("Bundle secret does not match derived secret");
} else
m->haveSecret = EXISTING_BUNDLE_ID;
if (config.debug.rhizome)
DEBUGF("found bundle author sid=%s", alloca_tohex_sid_t(*authorSidp));
rhizome_manifest_set_author(m, authorSidp);
m->authorship = AUTHOR_AUTHENTIC;
// if this bundle is already in the database, update the author.
Add ROWID field to struct rhizome_manifest New ".rowid" output field from rhizome add, import, extract, export operations. (Also added missing ".inserttime" and "date" fields to some operations.) Use new "rhizome add file" .rowid output field to check output of of /restful/rhizome/bundlelist.json
2013-11-11 07:43:38 +00:00
if (m->rowid)
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
sqlite_exec_void_loglevel(LOG_LEVEL_WARN,
Add ROWID field to struct rhizome_manifest New ".rowid" output field from rhizome add, import, extract, export operations. (Also added missing ".inserttime" and "date" fields to some operations.) Use new "rhizome add file" .rowid output field to check output of of /restful/rhizome/bundlelist.json
2013-11-11 07:43:38 +00:00
"UPDATE MANIFESTS SET author = ? WHERE rowid = ?;",
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
SID_T, &m->author,
Add ROWID field to struct rhizome_manifest New ".rowid" output field from rhizome add, import, extract, export operations. (Also added missing ".inserttime" and "date" fields to some operations.) Use new "rhizome add file" .rowid output field to check output of of /restful/rhizome/bundlelist.json
2013-11-11 07:43:38 +00:00
INT64, m->rowid,
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
END);
RETURNVOID; // bingo
Add _selfsigned column to "rhizome list" output Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring Some tests in tests/rhizome fail
2012-06-08 08:55:43 +00:00
}
}
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
assert(m->authorship == ANONYMOUS);
Overhaul debug flags Replace debugflags_t and DEBUG_XXX bit masks with config schema "debug.xxx" entries. No more support for "debug.all".
2012-12-11 05:29:46 +00:00
if (config.debug.rhizome)
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
DEBUG("bundle author not found");
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Add <bsk> optional arg to "rhizome add file" Improve regular expressions for common data types in test scripts Revert column count field delimiter in "rhizome list" from ":" to "\n" Add a few more test cases
2012-06-05 04:28:59 +00:00
}
BK encoding and decoding complete, but untested.
2012-05-15 10:34:41 +00:00
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Verify the validity of a given secret manifest key. Return 1 if valid, 0 if not.
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
*
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
* There is no NaCl API to efficiently test this. We use a modified version of
* crypto_sign_keypair() to accomplish this task.
Add <bsk> optional arg to "rhizome add file" Improve regular expressions for common data types in test scripts Revert column count field delimiter in "rhizome list" from ":" to "\n" Add a few more test cases
2012-06-05 04:28:59 +00:00
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
int rhizome_verify_bundle_privatekey(const unsigned char *sk, const unsigned char *pkin)
Add <bsk> optional arg to "rhizome add file" Improve regular expressions for common data types in test scripts Revert column count field delimiter in "rhizome list" from ":" to "\n" Add a few more test cases
2012-06-05 04:28:59 +00:00
{
instrumented various rhizome functions.
2012-06-26 06:32:49 +00:00
IN();
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
rhizome_bid_t pk;
if (crypto_sign_compute_public_key(sk, pk.binary) == -1)
RETURN(0);
int ret = bcmp(pkin, pk.binary, sizeof pk.binary) == 0;
RETURN(ret);
BK encoding and decoding complete, but untested.
2012-05-15 10:34:41 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
int rhizome_sign_hash(rhizome_manifest *m, rhizome_signature *out)
substantial work towards implementing BK field in rhizome manifests.
2012-05-15 07:54:25 +00:00
{
instrumented various rhizome functions.
2012-06-26 06:32:49 +00:00
IN();
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
assert(m->haveSecret);
int ret = rhizome_sign_hash_with_key(m, m->cryptoSignSecret, m->cryptoSignPublic.binary, out);
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
RETURN(ret);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
}
int rhizome_sign_hash_with_key(rhizome_manifest *m,const unsigned char *sk,
const unsigned char *pk,rhizome_signature *out)
{
IN();
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
unsigned char signatureBuffer[crypto_sign_edwards25519sha512batch_BYTES + crypto_hash_sha512_BYTES];
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
unsigned char *hash = m->manifesthash;
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
unsigned long long sigLen = 0;
int mLen = crypto_hash_sha512_BYTES;
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
int r = crypto_sign_edwards25519sha512batch(signatureBuffer, &sigLen, &hash[0], mLen, sk);
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
if (r)
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
RETURN(WHY("crypto_sign_edwards25519sha512batch() failed"));
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
/* Here we use knowledge of the internal structure of the signature block
to remove the hash, since that is implicitly transported, thus reducing the
actual signature size down to 64 bytes.
We do then need to add the public key of the signatory on. */
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
bcopy(signatureBuffer, &out->signature[1], 64);
bcopy(pk, &out->signature[65], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
out->signatureLength = 65 + crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
Changed rhizome manifest signature block type code semantics to allow signature blocks of 256 bytes, and to allow multiple signature types with same length. #34
2012-10-29 05:37:42 +00:00
out->signature[0] = 0x17; // CryptoSign
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
RETURN(0);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
typedef struct manifest_signature_block_cache {
unsigned char manifest_hash[crypto_hash_sha512_BYTES];
unsigned char signature_bytes[256];
int signature_length;
int signature_valid;
} manifest_signature_block_cache;
#define SIG_CACHE_SIZE 1024
manifest_signature_block_cache sig_cache[SIG_CACHE_SIZE];
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
static int rhizome_manifest_lookup_signature_validity(const unsigned char *hash, const unsigned char *sig, int sig_len)
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
{
IN();
unsigned int slot=0;
int i;
for(i=0;i<crypto_hash_sha512_BYTES;i++) {
slot=(slot<<1)+(slot&0x80000000?1:0);
slot+=hash[i];
}
for(i=0;i<sig_len;i++) {
slot=(slot<<1)+(slot&0x80000000?1:0);
slot+=sig[i];
}
slot%=SIG_CACHE_SIZE;
Fix signature verification cache
2013-09-24 04:52:37 +00:00
if (sig_cache[slot].signature_length!=sig_len ||
memcmp(hash, sig_cache[slot].manifest_hash, crypto_hash_sha512_BYTES) ||
memcmp(sig, sig_cache[slot].signature_bytes, sig_len)){
bcopy(hash, sig_cache[slot].manifest_hash, crypto_hash_sha512_BYTES);
bcopy(sig, sig_cache[slot].signature_bytes, sig_len);
sig_cache[slot].signature_length=sig_len;
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
unsigned char sigBuf[256];
unsigned char verifyBuf[256];
unsigned char publicKey[256];
/* Reconstitute signature by putting manifest hash between the two
32-byte halves */
Imported ref10/ implementation of crypto_sign from supercop-20120525 as recommended a while back by Dan Bernstein as offering the fastest implementation of the crypto_sign() primitives for ARM. Indeed this implementation IS faster. See comparison below for a Rock 500 handset (800MHz(?) ARM6, no NEON): Original ref/ implementation on an R500 stock rom (non-rooted):: mean signature generation time = 96.80ms mean signature verification time = 272.20ms ref10/ implementations on an R500 stock rom (non-rooted): mean signature generation time = 4.00ms mean signature verification time = 13.00ms Approximately 20x speed up, just like that :)
2012-10-09 16:37:49 +00:00
bcopy(&sig[0],&sigBuf[0],64);
bcopy(hash,&sigBuf[64],crypto_hash_sha512_BYTES);
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
/* Get public key of signatory */
bcopy(&sig[64],&publicKey[0],crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
unsigned long long mlen=0;
Fix signature verification cache
2013-09-24 04:52:37 +00:00
sig_cache[slot].signature_valid=
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
crypto_sign_edwards25519sha512batch_open(verifyBuf,&mlen,&sigBuf[0],128,
publicKey)
? -1 : 0;
}
Fix signature verification cache
2013-09-24 04:52:37 +00:00
RETURN(sig_cache[slot].signature_valid);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
added cache for positive and negative rhizome manifest signature verifications to avoid repeating expensive lookups. not perfect, and not tested.
2012-06-26 11:51:46 +00:00
}
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
int rhizome_manifest_extract_signature(rhizome_manifest *m, unsigned *ofs)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
instrumented various rhizome functions.
2012-06-26 06:32:49 +00:00
IN();
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("*ofs=%u m->manifest_all_bytes=%zu", *ofs, m->manifest_all_bytes);
assert((*ofs) < m->manifest_all_bytes);
const unsigned char *sig = m->manifestdata + *ofs;
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
uint8_t sigType = m->manifestdata[*ofs];
uint8_t len = (sigType << 2) + 4 + 1;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (*ofs + len > m->manifest_all_bytes) {
WARNF("Invalid signature at offset %u: type=%#02x gives len=%u that overruns manifest size",
*ofs, sigType, len);
Fix Rhizome manifest parsing bug If an over-large manifest was supplied, signature extraction went into a tight loop
2014-04-29 05:38:02 +00:00
*ofs = m->manifest_all_bytes;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
RETURN(1);
}
*ofs += len;
assert (m->sig_count <= NELS(m->signatories));
if (m->sig_count == NELS(m->signatories)) {
WARN("Too many signature blocks in manifest");
RETURN(2);
}
switch (sigType) {
case 0x17: // crypto_sign_edwards25519sha512batch()
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(len == 97);
/* Reconstitute signature block */
int r = rhizome_manifest_lookup_signature_validity(m->manifesthash, sig + 1, 96);
if (r) {
WARN("Signature verification failed");
RETURN(4);
}
m->signatureTypes[m->sig_count] = len;
if ((m->signatories[m->sig_count] = emalloc(crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES)) == NULL)
RETURN(-1);
bcopy(sig + 1 + 64, m->signatories[m->sig_count], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
m->sig_count++;
if (config.debug.rhizome)
DEBUG("Signature verified");
RETURN(0);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
}
Fix formatting issues
2013-12-06 01:40:08 +00:00
WARNF("Unsupported signature at ofs=%u: type=%#02x", (unsigned)(sig - m->manifestdata), sigType);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
RETURN(3);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
// add value to nonce, with the same result regardless of CPU endian order
// allowing for any carry value up to the size of the whole nonce
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
static void add_nonce(unsigned char *nonce, uint64_t value)
{
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
int i=crypto_stream_xsalsa20_NONCEBYTES -1;
while(i>=0 && value>0){
int x = nonce[i]+(value & 0xFF);
nonce[i]=x&0xFF;
value = (value>>8)+(x>>8);
i--;
}
}
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
/* Encrypt a block of a stream in-place, allowing for offsets that don't align perfectly to block
* boundaries for efficiency the caller should use a buffer size of (n*RHIZOME_CRYPT_PAGE_SIZE).
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
*/
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
int rhizome_crypt_xor_block(unsigned char *buffer, size_t buffer_size, uint64_t stream_offset,
const unsigned char *key, const unsigned char *nonce)
{
uint64_t nonce_offset = stream_offset & ~(RHIZOME_CRYPT_PAGE_SIZE -1);
Use size_t in Rhizome store functions
2013-10-17 12:47:41 +00:00
size_t offset=0;
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
unsigned char block_nonce[crypto_stream_xsalsa20_NONCEBYTES];
bcopy(nonce, block_nonce, sizeof(block_nonce));
add_nonce(block_nonce, nonce_offset);
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
if (nonce_offset < stream_offset){
Use size_t in Rhizome store functions
2013-10-17 12:47:41 +00:00
size_t padding = stream_offset & (RHIZOME_CRYPT_PAGE_SIZE -1);
size_t size = RHIZOME_CRYPT_PAGE_SIZE - padding;
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
if (size>buffer_size)
size=buffer_size;
unsigned char temp[RHIZOME_CRYPT_PAGE_SIZE];
bcopy(buffer, temp + padding, size);
Fix xor encryption for journal bundles and unaligned read/write ops
2013-07-19 06:45:05 +00:00
crypto_stream_xsalsa20_xor(temp, temp, size+padding, block_nonce, key);
bcopy(temp + padding, buffer, size);
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
add_nonce(block_nonce, RHIZOME_CRYPT_PAGE_SIZE);
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
offset+=size;
}
while(offset < buffer_size){
Use size_t in Rhizome store functions
2013-10-17 12:47:41 +00:00
size_t size = buffer_size - offset;
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
if (size>RHIZOME_CRYPT_PAGE_SIZE)
size=RHIZOME_CRYPT_PAGE_SIZE;
Use size_t in Rhizome store functions
2013-10-17 12:47:41 +00:00
crypto_stream_xsalsa20_xor(buffer+offset, buffer+offset, (unsigned long long) size, block_nonce, key);
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
Add offset to nonce instead of replacing byte values
2013-01-02 04:35:22 +00:00
add_nonce(block_nonce, RHIZOME_CRYPT_PAGE_SIZE);
Add encryption support to writing of rhizome content
2012-12-21 00:23:47 +00:00
offset+=size;
}
return 0;
}
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
/* If payload key is known, sets m->payloadKey and m->payloadNonce and returns 1.
* Otherwise, returns 0;
*/
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
int rhizome_derive_payload_key(rhizome_manifest *m)
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
{
// don't do anything if the manifest isn't flagged as being encrypted
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
assert(m->payloadEncryption == PAYLOAD_ENCRYPTED);
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
unsigned char hash[crypto_hash_sha512_BYTES];
if (m->has_sender && m->has_recipient) {
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
unsigned char *nm_bytes=NULL;
Fix -Wsign-compare warnings in keyring: unsigned cn,in,kp
2013-12-10 06:04:35 +00:00
unsigned cn=0, in=0, kp=0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (!keyring_find_sid(keyring, &cn, &in, &kp, &m->sender)){
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
cn=in=kp=0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (!keyring_find_sid(keyring, &cn, &in, &kp, &m->recipient)){
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
WARNF("Neither sender=%s nor recipient=%s is in keyring",
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
alloca_tohex_sid_t(m->sender),
alloca_tohex_sid_t(m->recipient));
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
return 0;
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
}
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
nm_bytes = keyring_get_nm_bytes(&m->recipient, &m->sender);
if (config.debug.rhizome)
DEBUGF("derived payload key from recipient=%s* to sender=%s*",
alloca_tohex_sid_t_trunc(m->recipient, 7),
alloca_tohex_sid_t_trunc(m->sender, 7)
);
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
}else{
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
nm_bytes = keyring_get_nm_bytes(&m->sender, &m->recipient);
if (config.debug.rhizome)
DEBUGF("derived payload key from sender=%s* to recipient=%s*",
alloca_tohex_sid_t_trunc(m->sender, 7),
alloca_tohex_sid_t_trunc(m->recipient, 7)
);
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
}
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
assert(nm_bytes != NULL);
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
crypto_hash_sha512(hash, nm_bytes, crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES);
}else{
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
if (!m->haveSecret) {
WHY("Cannot derive payload key because bundle secret is unknown");
return 0;
}
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
if (config.debug.rhizome)
DEBUGF("derived payload key from bundle secret bsk=%s", alloca_tohex(m->cryptoSignSecret, sizeof m->cryptoSignSecret));
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
unsigned char raw_key[9+crypto_sign_edwards25519sha512batch_SECRETKEYBYTES]="sasquatch";
bcopy(m->cryptoSignSecret, &raw_key[9], crypto_sign_edwards25519sha512batch_SECRETKEYBYTES);
crypto_hash_sha512(hash, raw_key, sizeof(raw_key));
}
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
bcopy(hash, m->payloadKey, RHIZOME_CRYPT_KEY_BYTES);
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d].payloadKey = %s", m->manifest_record_number, alloca_tohex(m->payloadKey, sizeof m->payloadKey));
Fix xor encryption for journal bundles and unaligned read/write ops
2013-07-19 06:45:05 +00:00
// journal bundles must always have the same nonce, regardless of version.
// otherwise, generate nonce from version#bundle id#version;
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
unsigned char raw_nonce[8 + 8 + sizeof m->cryptoSignPublic.binary];
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
uint64_t nonce_version = m->is_journal ? 0 : m->version;
write_uint64(&raw_nonce[0], nonce_version);
rhizome_bid_t Consistent type for internal binary representation of Rhizome Bundle ID (aka Manifest ID)
2013-10-03 13:46:45 +00:00
bcopy(m->cryptoSignPublic.binary, &raw_nonce[8], sizeof m->cryptoSignPublic.binary);
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
write_uint64(&raw_nonce[8 + sizeof m->cryptoSignPublic.binary], nonce_version);
if (config.debug.rhizome)
DEBUGF("derived payload nonce from bid=%s version=%"PRIu64, alloca_tohex_sid_t(m->cryptoSignPublic), nonce_version);
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
crypto_hash_sha512(hash, raw_nonce, sizeof(raw_nonce));
bcopy(hash, m->payloadNonce, sizeof(m->payloadNonce));
Refactor rhizome_crypt_xor_block() and add debug
2013-12-30 05:29:59 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d].payloadNonce = %s", m->manifest_record_number, alloca_tohex(m->payloadNonce, sizeof m->payloadNonce));
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
return 1;
Improve debug logging - add debug.trace to help track down segfaults - warn about alarms without names (which are then hard to track down).
2013-02-15 19:52:37 +00:00
}
Reference in New Issue Copy Permalink