mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-27 08:32:33 +00:00
a95ef79139
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
701 lines
24 KiB
C
701 lines
24 KiB
C
/*
|
|
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.
|
|
*/
|
|
|
|
#include "crypto_sign_edwards25519sha512batch.h"
|
|
#include "nacl/src/crypto_sign_edwards25519sha512batch_ref/ge.h"
|
|
|
|
#include "serval.h"
|
|
#include "conf.h"
|
|
#include "str.h"
|
|
#include "rhizome.h"
|
|
#include "crypto.h"
|
|
#include <stdlib.h>
|
|
#include <ctype.h>
|
|
|
|
/* Work out the encrypt/decrypt key for the supplied manifest.
|
|
If the manifest is not encrypted, then return NULL.
|
|
*/
|
|
unsigned char *rhizome_bundle_shared_secret(rhizome_manifest *m)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
int rhizome_manifest_createid(rhizome_manifest *m)
|
|
{
|
|
if (crypto_sign_edwards25519sha512batch_keypair(m->cryptoSignPublic.binary, m->cryptoSignSecret))
|
|
return WHY("Failed to create keypair for manifest ID.");
|
|
rhizome_manifest_set(m, "id", alloca_tohex_rhizome_bid_t(m->cryptoSignPublic));
|
|
m->haveSecret = NEW_BUNDLE_ID;
|
|
return 0;
|
|
}
|
|
|
|
struct signing_key{
|
|
unsigned char Private[crypto_sign_edwards25519sha512batch_SECRETKEYBYTES];
|
|
rhizome_bid_t Public;
|
|
};
|
|
|
|
/* 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));
|
|
|
|
// The first 256 bits of the hash will be used as the private key of the BID.
|
|
bcopy(hash, key->Private, sizeof(key->Private));
|
|
if (crypto_sign_compute_public_key(key->Private, key->Public.binary))
|
|
return WHY("Could not generate public key");
|
|
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;
|
|
|
|
int ret=rhizome_retrieve_manifest(&key.Public, m);
|
|
if (ret<0)
|
|
return -1;
|
|
|
|
m->haveSecret=(ret==0)?EXISTING_BUNDLE_ID:NEW_BUNDLE_ID;
|
|
m->cryptoSignPublic = key.Public;
|
|
bcopy(key.Private, m->cryptoSignSecret, sizeof m->cryptoSignSecret);
|
|
if (ret>0)
|
|
rhizome_manifest_set(m, "id", alloca_tohex_rhizome_bid_t(m->cryptoSignPublic));
|
|
return ret;
|
|
}
|
|
|
|
/* Given a Rhizome Secret (RS) and bundle ID (BID), XOR a bundle key 'bkin' (private or public) with
|
|
* 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.
|
|
*
|
|
* @author Andrew Bettison <andrew@servalproject.org>
|
|
* @author Paul Gardner-Stephen <paul@servalproject.org>
|
|
*/
|
|
int rhizome_bk_xor_stream(
|
|
const rhizome_bid_t *bidp,
|
|
const unsigned char *rs,
|
|
const size_t rs_len,
|
|
unsigned char *xor_stream,
|
|
int xor_stream_byte_count)
|
|
{
|
|
IN();
|
|
if (rs_len<1||rs_len>65536) RETURN(WHY("rs_len invalid"));
|
|
if (xor_stream_byte_count<1||xor_stream_byte_count>crypto_hash_sha512_BYTES)
|
|
RETURN(WHY("xor_stream_byte_count invalid"));
|
|
|
|
int combined_len = rs_len + crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
|
|
unsigned char buffer[combined_len];
|
|
bcopy(&rs[0], &buffer[0], rs_len);
|
|
bcopy(&bidp->binary[0], &buffer[rs_len], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
unsigned char hash[crypto_hash_sha512_BYTES];
|
|
crypto_hash_sha512(hash,buffer,combined_len);
|
|
bcopy(hash,xor_stream,xor_stream_byte_count);
|
|
|
|
OUT();
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
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. */
|
|
int rhizome_bk2secret(rhizome_manifest *m,
|
|
const rhizome_bid_t *bidp,
|
|
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];
|
|
if (rhizome_bk_xor_stream(bidp,rs,rs_len,xor_stream,RHIZOME_BUNDLE_KEY_BYTES))
|
|
RETURN(WHY("rhizome_bk_xor_stream() failed"));
|
|
|
|
int i;
|
|
|
|
/* XOR and store secret part of secret key */
|
|
for(i = 0; i != RHIZOME_BUNDLE_KEY_BYTES; i++)
|
|
secret[i] = bkin[i] ^ xor_stream[i];
|
|
/* Copy BID as public-key part of secret key */
|
|
for(;i!=crypto_sign_edwards25519sha512batch_SECRETKEYBYTES;++i)
|
|
secret[i] = bidp->binary[i - RHIZOME_BUNDLE_KEY_BYTES];
|
|
|
|
bzero(xor_stream, sizeof xor_stream);
|
|
|
|
RETURN(rhizome_verify_bundle_privatekey(m, secret, bidp->binary));
|
|
OUT();
|
|
}
|
|
|
|
int rhizome_secret2bk(
|
|
const rhizome_bid_t *bidp,
|
|
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];
|
|
if (rhizome_bk_xor_stream(bidp,rs,rs_len,xor_stream,RHIZOME_BUNDLE_KEY_BYTES))
|
|
RETURN(WHY("rhizome_bk_xor_stream() failed"));
|
|
|
|
int i;
|
|
|
|
/* 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);
|
|
OUT();
|
|
}
|
|
|
|
|
|
/* Given the SID of a bundle's author, search for an identity in the keyring and return its
|
|
* Rhizome secret if found.
|
|
*
|
|
* Returns -1 if an error occurs.
|
|
* Returns 0 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.
|
|
* Returns 2 if the author's identity is not in the keyring.
|
|
* Returns 3 if the author's identity is in the keyring but has no rhizome secret.
|
|
*
|
|
* @author Andrew Bettison <andrew@servalproject.com>
|
|
*/
|
|
int rhizome_find_secret(const sid_t *authorSidp, int *rs_len, const unsigned char **rs)
|
|
{
|
|
int cn=0, in=0, kp=0;
|
|
if (!keyring_find_sid(keyring,&cn,&in,&kp, authorSidp)) {
|
|
if (config.debug.rhizome)
|
|
DEBUGF("identity sid=%s is not in keyring", alloca_tohex_sid_t(*authorSidp));
|
|
return 2;
|
|
}
|
|
kp = keyring_identity_find_keytype(keyring, cn, in, KEYTYPE_RHIZOME);
|
|
if (kp == -1) {
|
|
if (config.debug.rhizome)
|
|
DEBUGF("identity sid=%s has no Rhizome Secret", alloca_tohex_sid_t(*authorSidp));
|
|
return 3;
|
|
}
|
|
int rslen = keyring->contexts[cn]->identities[in]->keypairs[kp]->private_key_len;
|
|
if (rslen < 16 || rslen > 1024)
|
|
return WHYF("identity sid=%s has invalid Rhizome Secret: length=%d", alloca_tohex_sid_t(*authorSidp), rslen);
|
|
if (rs_len)
|
|
*rs_len = rslen;
|
|
if (rs)
|
|
*rs = keyring->contexts[cn]->identities[in]->keypairs[kp]->private_key;
|
|
return 0;
|
|
}
|
|
|
|
/* Given the SID of a bundle's author and the bundle ID, XOR a bundle key (private or public) with
|
|
* RS##BID where RS is the rhizome secret of the bundle's author, and BID is the bundle's public key
|
|
* (aka the Bundle ID).
|
|
*
|
|
* This will convert a manifest BK field into the bundle's private key, or vice versa.
|
|
*
|
|
* Returns -1 if an error occurs.
|
|
* Returns 0 if the author's private key is located and the XOR is performed successfully.
|
|
* Returns 2 if the author's identity is not in the keyring (this return code from
|
|
* rhizome_find_secret()).
|
|
* Returns 3 if the author's identity is in the keyring but has no rhizome secret (this return code
|
|
* from rhizome_find_secret()).
|
|
*
|
|
* Looks up the SID in the keyring, and if it is present and has a valid-looking RS, calls
|
|
* rhizome_bk_xor_rs() to perform the XOR.
|
|
*
|
|
* @author Andrew Bettison <andrew@servalproject.com>
|
|
*/
|
|
|
|
/* See if the manifest has a BK entry, and if so, use it to obtain the private key for the BID. The
|
|
* manifest's 'author' field must contain the (binary) SID of the purported author of the bundle,
|
|
* which is used to look up the author's rhizome secret in the keyring.
|
|
*
|
|
* Returns 0 if a valid private key was extracted, with the private key in the manifest
|
|
* 'cryptoSignSecret' field and the 'haveSecret' field set to 1.
|
|
*
|
|
* Returns 1 if the manifest does not have a BK field.
|
|
*
|
|
* Returns 2 if the author is not found in the keyring (not unlocked?) -- this return code from
|
|
* rhizome_bk_xor().
|
|
*
|
|
* Returns 3 if the author is found in the keyring but has no rhizome secret -- this return code
|
|
* from rhizome_bk_xor().
|
|
*
|
|
* Returns 4 if the author is found in the keyring and has a rhizome secret but the private bundle
|
|
* key formed using it does not verify.
|
|
*
|
|
* Returns -1 on error.
|
|
*
|
|
* @author Andrew Bettison <andrew@servalproject.com>
|
|
|
|
*/
|
|
int rhizome_extract_privatekey(rhizome_manifest *m, rhizome_bk_t *bsk)
|
|
{
|
|
IN();
|
|
unsigned char bkBytes[RHIZOME_BUNDLE_KEY_BYTES];
|
|
char *bk = rhizome_manifest_get(m, "BK", NULL, 0);
|
|
int result;
|
|
|
|
if (bk){
|
|
if (fromhexstr(bkBytes, bk, RHIZOME_BUNDLE_KEY_BYTES) == -1)
|
|
RETURN(WHYF("invalid BK field: %s", bk));
|
|
|
|
if (is_sid_t_any(m->author)) {
|
|
result=rhizome_find_bundle_author(m);
|
|
}else{
|
|
int rs_len;
|
|
const unsigned char *rs;
|
|
result = rhizome_find_secret(&m->author, &rs_len, &rs);
|
|
if (result==0)
|
|
result = rhizome_bk2secret(m, &m->cryptoSignPublic, rs, rs_len, bkBytes, m->cryptoSignSecret);
|
|
}
|
|
|
|
if (result == 0 && bsk && !rhizome_is_bk_none(bsk)){
|
|
// If a bundle secret key was supplied that does not match the secret key derived from the
|
|
// author, then warn but carry on using the author's.
|
|
if (memcmp(bsk, m->cryptoSignSecret, RHIZOME_BUNDLE_KEY_BYTES) != 0)
|
|
WARNF("Supplied bundle secret key is invalid -- ignoring");
|
|
}
|
|
|
|
}else if(bsk && !rhizome_is_bk_none(bsk)){
|
|
bcopy(m->cryptoSignPublic.binary, &m->cryptoSignSecret[RHIZOME_BUNDLE_KEY_BYTES], sizeof m->cryptoSignPublic.binary);
|
|
bcopy(bsk, m->cryptoSignSecret, RHIZOME_BUNDLE_KEY_BYTES);
|
|
if (rhizome_verify_bundle_privatekey(m, m->cryptoSignSecret, m->cryptoSignPublic.binary))
|
|
result=5;
|
|
else
|
|
result=0;
|
|
}else{
|
|
result=1;
|
|
}
|
|
|
|
if (result == 0){
|
|
m->haveSecret=EXISTING_BUNDLE_ID;
|
|
}else{
|
|
memset(m->cryptoSignSecret, 0, sizeof m->cryptoSignSecret);
|
|
m->haveSecret=0;
|
|
}
|
|
|
|
RETURN(result);
|
|
OUT();
|
|
}
|
|
|
|
/* Same as rhizome_extract_privatekey, except warnings become errors and are logged */
|
|
int rhizome_extract_privatekey_required(rhizome_manifest *m, rhizome_bk_t *bsk)
|
|
{
|
|
int result = rhizome_extract_privatekey(m, bsk);
|
|
switch (result) {
|
|
case -1:
|
|
case 0:
|
|
return result;
|
|
case 1:
|
|
return WHY("Bundle contains no BK field, and no bundle secret supplied");
|
|
case 2:
|
|
return WHY("Author unknown");
|
|
case 3:
|
|
return WHY("Author does not have a Rhizome Secret");
|
|
case 4:
|
|
return WHY("Author does not have permission to modify manifest");
|
|
case 5:
|
|
return WHY("Bundle secret is not valid for this manifest");
|
|
default:
|
|
return WHYF("Unknown result from rhizome_extract_privatekey(): %d", result);
|
|
}
|
|
}
|
|
|
|
/* Discover if the given manifest was created (signed) by any unlocked identity currently in the
|
|
* keyring.
|
|
*
|
|
* Returns 0 if an identity is found with permission to alter the bundle, after setting the manifest
|
|
* 'author' field to the SID of the identity and the manifest 'cryptoSignSecret' field to the bundle
|
|
* secret key and the 'haveSecret' field to 1.
|
|
*
|
|
* Returns 1 if no identity in the keyring is the author of this bundle.
|
|
*
|
|
* Returns 4 if the manifest has no BK field.
|
|
*
|
|
* Returns -1 if an error occurs, eg, the manifest contains an invalid BK field.
|
|
*
|
|
* @author Andrew Bettison <andrew@servalproject.com>
|
|
*/
|
|
int rhizome_find_bundle_author(rhizome_manifest *m)
|
|
{
|
|
IN();
|
|
char *bk = rhizome_manifest_get(m, "BK", NULL, 0);
|
|
if (!bk) {
|
|
if (config.debug.rhizome)
|
|
DEBUGF("missing BK field");
|
|
RETURN(4);
|
|
}
|
|
unsigned char bkBytes[RHIZOME_BUNDLE_KEY_BYTES];
|
|
if (fromhexstr(bkBytes, bk, RHIZOME_BUNDLE_KEY_BYTES) == -1)
|
|
RETURN(WHYF("invalid BK field: %s", bk));
|
|
int cn = 0, in = 0, kp = 0;
|
|
for (; keyring_next_identity(keyring, &cn, &in, &kp); ++kp) {
|
|
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));
|
|
int rkp = keyring_identity_find_keytype(keyring, cn, in, KEYTYPE_RHIZOME);
|
|
if (rkp != -1) {
|
|
int rs_len = keyring->contexts[cn]->identities[in]->keypairs[rkp]->private_key_len;
|
|
if (rs_len < 16 || rs_len > 1024)
|
|
RETURN(WHYF("invalid Rhizome Secret: length=%d", rs_len));
|
|
const unsigned char *rs = keyring->contexts[cn]->identities[in]->keypairs[rkp]->private_key;
|
|
|
|
if (!rhizome_bk2secret(m, &m->cryptoSignPublic, rs, rs_len, bkBytes, m->cryptoSignSecret)) {
|
|
m->haveSecret=EXISTING_BUNDLE_ID;
|
|
if (cmp_sid_t(&m->author, authorSidp) != 0){
|
|
m->author = *authorSidp;
|
|
if (config.debug.rhizome)
|
|
DEBUGF("found bundle author sid=%s", alloca_tohex_sid_t(m->author));
|
|
// if this bundle is already in the database, update the author.
|
|
if (m->inserttime)
|
|
sqlite_exec_void_loglevel(LOG_LEVEL_WARN,
|
|
"UPDATE MANIFESTS SET author = ? WHERE id = ?;",
|
|
SID_T, &m->author,
|
|
RHIZOME_BID_T, &m->cryptoSignPublic,
|
|
END);
|
|
}
|
|
|
|
RETURN(0); // bingo
|
|
}
|
|
}
|
|
}
|
|
if (config.debug.rhizome)
|
|
DEBUG("bundle author not found");
|
|
RETURN(1);
|
|
OUT();
|
|
}
|
|
|
|
/* Verify the validity of the manifest's secret key, ie, is the given manifest's 'cryptoSignSecret'
|
|
* field actually the secret key corresponding to the public key in 'cryptoSignPublic'?
|
|
* Return 0 if valid, 1 if not. Return -1 if an error occurs.
|
|
*
|
|
* There is no NaCl API to efficiently test this. We use a modified version of
|
|
* crypto_sign_keypair() to accomplish this task.
|
|
*/
|
|
int rhizome_verify_bundle_privatekey(rhizome_manifest *m,
|
|
const unsigned char *sk,
|
|
const unsigned char *pkin)
|
|
{
|
|
IN();
|
|
unsigned char pk[32];
|
|
int i;
|
|
crypto_sign_compute_public_key(sk,pk);
|
|
for (i = 0;i < 32;++i)
|
|
if (pkin[i] != pk[i]) {
|
|
if (m&&sk==m->cryptoSignSecret&&pkin==m->cryptoSignPublic.binary)
|
|
m->haveSecret=0;
|
|
RETURN(-1);
|
|
}
|
|
if (m&&sk==m->cryptoSignSecret&&pkin==m->cryptoSignPublic.binary) {
|
|
if (config.debug.rhizome)
|
|
DEBUGF("We have the private key for this bundle.");
|
|
m->haveSecret=EXISTING_BUNDLE_ID;
|
|
}
|
|
RETURN(0);
|
|
OUT();
|
|
}
|
|
|
|
int rhizome_sign_hash(rhizome_manifest *m,
|
|
rhizome_signature *out)
|
|
{
|
|
IN();
|
|
if (!m->haveSecret && rhizome_extract_privatekey_required(m, NULL))
|
|
RETURN(-1);
|
|
|
|
int ret=rhizome_sign_hash_with_key(m, m->cryptoSignSecret, m->cryptoSignPublic.binary, out);
|
|
RETURN(ret);
|
|
OUT();
|
|
}
|
|
|
|
int rhizome_sign_hash_with_key(rhizome_manifest *m,const unsigned char *sk,
|
|
const unsigned char *pk,rhizome_signature *out)
|
|
{
|
|
IN();
|
|
unsigned char signatureBuffer[crypto_sign_edwards25519sha512batch_BYTES + crypto_hash_sha512_BYTES];
|
|
unsigned char *hash = m->manifesthash;
|
|
unsigned long long sigLen = 0;
|
|
int mLen = crypto_hash_sha512_BYTES;
|
|
int r = crypto_sign_edwards25519sha512batch(signatureBuffer, &sigLen, &hash[0], mLen, sk);
|
|
if (r)
|
|
RETURN(WHY("crypto_sign_edwards25519sha512batch() failed."));
|
|
/* 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. */
|
|
bcopy(signatureBuffer, &out->signature[1], 64);
|
|
bcopy(pk, &out->signature[65], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
out->signatureLength = 65 + crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
|
|
out->signature[0] = 0x17; // CryptoSign
|
|
RETURN(0);
|
|
OUT();
|
|
}
|
|
|
|
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];
|
|
|
|
int rhizome_manifest_lookup_signature_validity(unsigned char *hash,unsigned char *sig,int sig_len)
|
|
{
|
|
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;
|
|
|
|
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;
|
|
|
|
unsigned char sigBuf[256];
|
|
unsigned char verifyBuf[256];
|
|
unsigned char publicKey[256];
|
|
|
|
/* Reconstitute signature by putting manifest hash between the two
|
|
32-byte halves */
|
|
bcopy(&sig[0],&sigBuf[0],64);
|
|
bcopy(hash,&sigBuf[64],crypto_hash_sha512_BYTES);
|
|
|
|
/* Get public key of signatory */
|
|
bcopy(&sig[64],&publicKey[0],crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
|
|
unsigned long long mlen=0;
|
|
sig_cache[slot].signature_valid=
|
|
crypto_sign_edwards25519sha512batch_open(verifyBuf,&mlen,&sigBuf[0],128,
|
|
publicKey)
|
|
? -1 : 0;
|
|
}
|
|
RETURN(sig_cache[slot].signature_valid);
|
|
OUT();
|
|
}
|
|
|
|
int rhizome_manifest_extract_signature(rhizome_manifest *m,int *ofs)
|
|
{
|
|
IN();
|
|
if (!m)
|
|
RETURN(WHY("NULL pointer passed in as manifest"));
|
|
if (config.debug.rhizome)
|
|
DEBUGF("m->manifest_all_bytes=%d m->manifest_bytes=%d *ofs=%d", m->manifest_all_bytes, m->manifest_bytes, *ofs);
|
|
|
|
if ((*ofs)>=m->manifest_all_bytes) { RETURN(0); }
|
|
|
|
int sigType=m->manifestdata[*ofs];
|
|
int len=(sigType&0x3f)*4+4+1;
|
|
|
|
/* Each signature type is required to have a different length to detect it.
|
|
At present only crypto_sign_edwards25519sha512batch() signatures are
|
|
supported. */
|
|
int r;
|
|
if (m->sig_count<MAX_MANIFEST_VARS)
|
|
switch(sigType)
|
|
{
|
|
case 0x17: /* crypto_sign_edwards25519sha512batch() */
|
|
/* Reconstitute signature block */
|
|
r=rhizome_manifest_lookup_signature_validity
|
|
(m->manifesthash,&m->manifestdata[(*ofs)+1],96);
|
|
#ifdef DEPRECATED
|
|
unsigned char sigBuf[256];
|
|
unsigned char verifyBuf[256];
|
|
unsigned char publicKey[256];
|
|
bcopy(&m->manifestdata[(*ofs)+1],&sigBuf[0],64);
|
|
bcopy(&m->manifesthash[0],&sigBuf[64],crypto_hash_sha512_BYTES);
|
|
/* Get public key of signatory */
|
|
bcopy(&m->manifestdata[(*ofs)+1+64],&publicKey[0],crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
unsigned long long mlen=0;
|
|
int r=crypto_sign_edwards25519sha512batch_open(verifyBuf,&mlen,&sigBuf[0],128, publicKey);
|
|
#endif
|
|
if (r) {
|
|
(*ofs)+=len;
|
|
m->errors++;
|
|
RETURN(WHY("Error in signature block (verification failed)."));
|
|
} else {
|
|
/* Signature block passes, so add to list of signatures */
|
|
m->signatureTypes[m->sig_count]=len;
|
|
m->signatories[m->sig_count]
|
|
=malloc(crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
if(!m->signatories[m->sig_count]) {
|
|
(*ofs)+=len;
|
|
RETURN(WHY("malloc() failed when reading signature block"));
|
|
}
|
|
bcopy(&m->manifestdata[(*ofs)+1+64],m->signatories[m->sig_count],
|
|
crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
|
m->sig_count++;
|
|
if (config.debug.rhizome) DEBUG("Signature passed.");
|
|
}
|
|
break;
|
|
default:
|
|
(*ofs)+=len;
|
|
m->errors++;
|
|
RETURN(WHYF("Encountered illegal or malformed signature block (unknown type=0x%02x @ offset 0x%x)",sigType,(*ofs)-len));
|
|
}
|
|
else
|
|
{
|
|
(*ofs)+=len;
|
|
WHY("Too many signature blocks in manifest.");
|
|
m->errors++;
|
|
}
|
|
|
|
(*ofs)+=len;
|
|
RETURN(0);
|
|
OUT();
|
|
}
|
|
|
|
// 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
|
|
static void add_nonce(unsigned char *nonce, int64_t value){
|
|
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--;
|
|
}
|
|
}
|
|
|
|
/* crypt a block of a stream, 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)
|
|
*/
|
|
int rhizome_crypt_xor_block(unsigned char *buffer, int buffer_size, int64_t stream_offset,
|
|
const unsigned char *key, const unsigned char *nonce){
|
|
|
|
if (stream_offset<0)
|
|
return WHY("Invalid stream offset");
|
|
|
|
int64_t nonce_offset = stream_offset & ~(RHIZOME_CRYPT_PAGE_SIZE -1);
|
|
int offset=0;
|
|
|
|
unsigned char block_nonce[crypto_stream_xsalsa20_NONCEBYTES];
|
|
bcopy(nonce, block_nonce, sizeof(block_nonce));
|
|
add_nonce(block_nonce, nonce_offset);
|
|
|
|
if (nonce_offset < stream_offset){
|
|
int padding = stream_offset & (RHIZOME_CRYPT_PAGE_SIZE -1);
|
|
int size = RHIZOME_CRYPT_PAGE_SIZE - padding;
|
|
if (size>buffer_size)
|
|
size=buffer_size;
|
|
|
|
unsigned char temp[RHIZOME_CRYPT_PAGE_SIZE];
|
|
bcopy(buffer, temp + padding, size);
|
|
crypto_stream_xsalsa20_xor(temp, temp, size+padding, block_nonce, key);
|
|
bcopy(temp + padding, buffer, size);
|
|
|
|
add_nonce(block_nonce, RHIZOME_CRYPT_PAGE_SIZE);
|
|
offset+=size;
|
|
}
|
|
|
|
while(offset < buffer_size){
|
|
int size = buffer_size - offset;
|
|
if (size>RHIZOME_CRYPT_PAGE_SIZE)
|
|
size=RHIZOME_CRYPT_PAGE_SIZE;
|
|
|
|
crypto_stream_xsalsa20_xor(buffer+offset, buffer+offset, size, block_nonce, key);
|
|
|
|
add_nonce(block_nonce, RHIZOME_CRYPT_PAGE_SIZE);
|
|
offset+=size;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int rhizome_derive_key(rhizome_manifest *m, rhizome_bk_t *bsk)
|
|
{
|
|
// don't do anything if the manifest isn't flagged as being encrypted
|
|
if (!m->payloadEncryption)
|
|
return 0;
|
|
if (m->payloadEncryption!=1)
|
|
return WHYF("Unsupported encryption scheme %d", m->payloadEncryption);
|
|
|
|
char *sender = rhizome_manifest_get(m, "sender", NULL, 0);
|
|
char *recipient = rhizome_manifest_get(m, "recipient", NULL, 0);
|
|
|
|
if (sender && recipient){
|
|
sid_t sender_sid, recipient_sid;
|
|
if (cf_opt_sid(&sender_sid, sender)!=CFOK)
|
|
return WHYF("Unable to parse sender sid");
|
|
if (cf_opt_sid(&recipient_sid, recipient)!=CFOK)
|
|
return WHYF("Unable to parse recipient sid");
|
|
|
|
unsigned char *nm_bytes=NULL;
|
|
int cn=0,in=0,kp=0;
|
|
if (!keyring_find_sid(keyring, &cn, &in, &kp, &sender_sid)){
|
|
cn=in=kp=0;
|
|
if (!keyring_find_sid(keyring, &cn, &in, &kp, &recipient_sid)){
|
|
return WHYF("Neither the sender %s nor the recipient %s appears in our keyring", sender, recipient);
|
|
}
|
|
nm_bytes=keyring_get_nm_bytes(&recipient_sid, &sender_sid);
|
|
}else{
|
|
nm_bytes=keyring_get_nm_bytes(&sender_sid, &recipient_sid);
|
|
}
|
|
|
|
if (!nm_bytes)
|
|
return -1;
|
|
|
|
unsigned char hash[crypto_hash_sha512_BYTES];
|
|
crypto_hash_sha512(hash, nm_bytes, crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES);
|
|
bcopy(hash, m->payloadKey, RHIZOME_CRYPT_KEY_BYTES);
|
|
|
|
}else{
|
|
if(!m->haveSecret){
|
|
if (rhizome_extract_privatekey_required(m, bsk))
|
|
return -1;
|
|
}
|
|
|
|
unsigned char raw_key[9+crypto_sign_edwards25519sha512batch_SECRETKEYBYTES]="sasquatch";
|
|
bcopy(m->cryptoSignSecret, &raw_key[9], crypto_sign_edwards25519sha512batch_SECRETKEYBYTES);
|
|
|
|
unsigned char hash[crypto_hash_sha512_BYTES];
|
|
|
|
crypto_hash_sha512(hash, raw_key, sizeof(raw_key));
|
|
bcopy(hash, m->payloadKey, RHIZOME_CRYPT_KEY_BYTES);
|
|
}
|
|
|
|
// journal bundles must always have the same nonce, regardless of version.
|
|
// otherwise, generate nonce from version#bundle id#version;
|
|
unsigned char raw_nonce[8 + 8 + sizeof m->cryptoSignPublic.binary];
|
|
write_uint64(&raw_nonce[0], m->journalTail>=0?0:m->version);
|
|
bcopy(m->cryptoSignPublic.binary, &raw_nonce[8], sizeof m->cryptoSignPublic.binary);
|
|
write_uint64(&raw_nonce[8 + sizeof m->cryptoSignPublic.binary], m->journalTail>=0?0:m->version);
|
|
|
|
unsigned char hash[crypto_hash_sha512_BYTES];
|
|
|
|
crypto_hash_sha512(hash, raw_nonce, sizeof(raw_nonce));
|
|
bcopy(hash, m->payloadNonce, sizeof(m->payloadNonce));
|
|
|
|
return 0;
|
|
}
|