2012-04-10 03:25:46 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 2010-2012 Paul Gardner-Stephen, Serval Project.
|
|
|
|
|
|
|
|
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 "serval.h"
|
2012-04-10 21:20:57 +00:00
|
|
|
#include "nacl.h"
|
2012-04-10 03:25:46 +00:00
|
|
|
|
2012-04-10 04:19:18 +00:00
|
|
|
static int urandomfd = -1;
|
|
|
|
|
|
|
|
int urandombytes(unsigned char *x,unsigned long long xlen)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int t=0;
|
|
|
|
|
|
|
|
if (urandomfd == -1) {
|
|
|
|
for (i=0;i<4;i++) {
|
|
|
|
urandomfd = open("/dev/urandom",O_RDONLY);
|
|
|
|
if (urandomfd != -1) break;
|
|
|
|
sleep(1);
|
|
|
|
}
|
|
|
|
if (i==4) return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (xlen > 0) {
|
|
|
|
if (xlen < 1048576) i = xlen; else i = 1048576;
|
|
|
|
|
|
|
|
i = read(urandomfd,x,i);
|
|
|
|
if (i < 1) {
|
|
|
|
sleep(1);
|
|
|
|
t++;
|
|
|
|
if (t>4) return -1;
|
|
|
|
continue;
|
|
|
|
} else t=0;
|
|
|
|
|
|
|
|
x += i;
|
|
|
|
xlen -= i;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2012-04-10 03:25:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
Open keyring file, read BAM and create initial context using the
|
|
|
|
stored salt. */
|
|
|
|
keyring_file *keyring_open(char *file)
|
|
|
|
{
|
|
|
|
/* Allocate structure */
|
|
|
|
keyring_file *k=calloc(sizeof(keyring_file),1);
|
|
|
|
if (!k) { WHY("calloc() failed"); return NULL; }
|
|
|
|
|
|
|
|
/* Open keyring file read-write if we can, else use it read-only */
|
|
|
|
k->file=fopen(file,"r+");
|
|
|
|
if (!k->file) k->file=fopen(file,"r");
|
2012-04-12 04:30:51 +00:00
|
|
|
if (!k->file) k->file=fopen(file,"w+");
|
2012-04-10 03:25:46 +00:00
|
|
|
if (!k->file) {
|
|
|
|
WHY("Could not open keyring file");
|
2012-04-12 04:30:51 +00:00
|
|
|
fprintf(stderr,"file='%s'\n",file);
|
2012-04-10 03:25:46 +00:00
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (fseeko(k->file,0,SEEK_END))
|
|
|
|
{
|
|
|
|
WHY("Could not seek to end of keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
k->file_size=ftello(k->file);
|
|
|
|
|
2012-04-10 04:19:18 +00:00
|
|
|
if (k->file_size<KEYRING_PAGE_SIZE) {
|
|
|
|
/* Uninitialised, so write 2KB of zeroes,
|
|
|
|
followed by 2KB of random bytes as salt. */
|
|
|
|
if (fseeko(k->file,0,SEEK_SET)) {
|
|
|
|
WHY("Could not seek to start of file to write header");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
unsigned char buffer[KEYRING_PAGE_SIZE];
|
|
|
|
bzero(&buffer[0],KEYRING_BAM_BYTES);
|
|
|
|
if (fwrite(&buffer[0],2048,1,k->file)!=1) {
|
|
|
|
WHY("Could not write empty bitmap in fresh keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (urandombytes(&buffer[0],KEYRING_PAGE_SIZE-KEYRING_BAM_BYTES))
|
|
|
|
{
|
|
|
|
WHY("Could not get random keyring salt to put in fresh keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (fwrite(&buffer[0],KEYRING_PAGE_SIZE-KEYRING_BAM_BYTES,1,k->file)!=1) {
|
|
|
|
WHY("Could not write keyring salt in fresh keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-12 04:30:51 +00:00
|
|
|
k->file_size=KEYRING_PAGE_SIZE;
|
2012-04-10 04:19:18 +00:00
|
|
|
}
|
|
|
|
|
2012-04-10 03:25:46 +00:00
|
|
|
/* Read BAMs for each slab in the file */
|
|
|
|
keyring_bam **b=&k->bam;
|
|
|
|
off_t offset=0;
|
|
|
|
while(offset<k->file_size) {
|
|
|
|
/* Read bitmap from slab.
|
|
|
|
Also, if offset is zero, read the salt */
|
|
|
|
if (fseeko(k->file,offset,SEEK_SET))
|
|
|
|
{
|
|
|
|
WHY("Could not seek to BAM in keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
*b=calloc(sizeof(keyring_bam),1);
|
|
|
|
if (!(*b))
|
|
|
|
{
|
|
|
|
WHY("Could not allocate keyring_bam structure for key ring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
(*b)->file_offset=offset;
|
|
|
|
/* Read bitmap */
|
|
|
|
int r=fread(&(*b)->bitmap[0],KEYRING_BAM_BYTES,1,k->file);
|
|
|
|
if (r!=1)
|
|
|
|
{
|
|
|
|
WHY("Could not read BAM from keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read salt if this is the first bitmap block.
|
|
|
|
We setup a context for this self-supplied key-ring salt.
|
|
|
|
(other keyring salts may be provided later on, resulting in
|
2012-04-12 04:30:51 +00:00
|
|
|
multiple contexts being loaded) */
|
2012-04-10 03:25:46 +00:00
|
|
|
if (!offset) {
|
|
|
|
k->contexts[0]=calloc(sizeof(keyring_context),1);
|
|
|
|
if (!k->contexts[0])
|
|
|
|
{
|
|
|
|
WHY("Could not allocate keyring_context for keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-12 04:30:51 +00:00
|
|
|
k->contexts[0]->KeyRingPin=strdup(""); /* Implied empty PIN if none provided */
|
2012-04-10 03:25:46 +00:00
|
|
|
k->contexts[0]->KeyRingSaltLen=KEYRING_PAGE_SIZE-KEYRING_BAM_BYTES;
|
|
|
|
k->contexts[0]->KeyRingSalt=malloc(k->contexts[0]->KeyRingSaltLen);
|
|
|
|
if (!k->contexts[0]->KeyRingSalt)
|
|
|
|
{
|
|
|
|
WHY("Could not allocate keyring_context->salt for keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
r=fread(&k->contexts[0]->KeyRingSalt[0],k->contexts[0]->KeyRingSaltLen,1,k->file);
|
|
|
|
if (r!=1)
|
|
|
|
{
|
|
|
|
WHY("Could not read salt from keyring file");
|
|
|
|
keyring_free(k);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
k->context_count=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip to next slab, and find next bam pointer. */
|
|
|
|
offset+=KEYRING_PAGE_SIZE*(KEYRING_BAM_BYTES<<3);
|
|
|
|
b=&(*b)->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return k;
|
|
|
|
}
|
|
|
|
|
|
|
|
void keyring_free(keyring_file *k)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (!k) return;
|
|
|
|
|
|
|
|
/* Close keyring file handle */
|
|
|
|
if (k->file) fclose(k->file);
|
|
|
|
k->file=NULL;
|
|
|
|
|
|
|
|
/* Free BAMs (no substructure, so easy) */
|
|
|
|
keyring_bam *b=k->bam;
|
|
|
|
while(b) {
|
|
|
|
keyring_bam *last_bam=b;
|
|
|
|
b=b->next;
|
|
|
|
/* Clear out any private data */
|
|
|
|
bzero(last_bam,sizeof(keyring_bam));
|
|
|
|
/* release structure */
|
|
|
|
free(last_bam);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Free contexts (including subordinate identities and dynamically allocated salt strings).
|
|
|
|
Don't forget to overwrite any private data. */
|
|
|
|
for(i=0;i<KEYRING_MAX_CONTEXTS;i++)
|
|
|
|
if (k->contexts[i]) {
|
|
|
|
keyring_free_context(k->contexts[i]);
|
|
|
|
k->contexts[i]=NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wipe everything, just to be sure. */
|
|
|
|
bzero(k,sizeof(keyring_file));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void keyring_free_context(keyring_context *c)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (!c) return;
|
|
|
|
|
|
|
|
if (c->KeyRingPin) {
|
|
|
|
/* Wipe pin before freeing (slightly tricky since this is a variable length string */
|
|
|
|
for(i=0;c->KeyRingPin[i];i++) c->KeyRingPin[i]=' '; i=0;
|
|
|
|
free(c->KeyRingPin); c->KeyRingPin=NULL;
|
|
|
|
}
|
|
|
|
if (c->KeyRingSalt) {
|
|
|
|
bzero(c->KeyRingSalt,c->KeyRingSaltLen);
|
|
|
|
c->KeyRingSalt=NULL;
|
|
|
|
c->KeyRingSaltLen=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wipe out any loaded identities */
|
|
|
|
for(i=0;i<KEYRING_MAX_IDENTITIES;i++)
|
|
|
|
if (c->identities[i]) keyring_free_identity(c->identities[i]);
|
|
|
|
|
|
|
|
/* Make sure any private data is wiped out */
|
|
|
|
bzero(c,sizeof(keyring_context));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void keyring_free_identity(keyring_identity *id)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (id->PKRPin) {
|
|
|
|
/* Wipe pin before freeing (slightly tricky since this is a variable length string */
|
|
|
|
for(i=0;id->PKRPin[i];i++) id->PKRPin[i]=' '; i=0;
|
|
|
|
free(id->PKRPin); id->PKRPin=NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i=0;i<PKR_MAX_KEYPAIRS;i++)
|
|
|
|
if (id->keypairs[i])
|
|
|
|
keyring_free_keypair(id->keypairs[i]);
|
|
|
|
|
|
|
|
bzero(id,sizeof(keyring_identity));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void keyring_free_keypair(keypair *kp)
|
|
|
|
{
|
|
|
|
if (kp->private_key) {
|
|
|
|
bzero(kp->private_key,kp->private_key_len);
|
|
|
|
free(kp->private_key);
|
|
|
|
kp->private_key=NULL;
|
|
|
|
}
|
|
|
|
if (kp->public_key) {
|
|
|
|
bzero(kp->public_key,kp->public_key_len);
|
|
|
|
free(kp->public_key);
|
|
|
|
kp->public_key=NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bzero(kp,sizeof(keypair));
|
|
|
|
return;
|
|
|
|
}
|
2012-04-10 04:19:18 +00:00
|
|
|
|
|
|
|
/* Create a new keyring context for the loaded keyring file.
|
|
|
|
We don't need to load any identities etc, as that happens when we enter
|
|
|
|
an identity pin.
|
|
|
|
If the pin is NULL, it is assumed to be blank.
|
|
|
|
The pin does NOT have to be numeric, and has no practical length limitation,
|
|
|
|
as it is used as an input into a hashing function. But for sanity sake, let's
|
|
|
|
limit it to 16KB.
|
|
|
|
*/
|
|
|
|
int keyring_enter_keyringpin(keyring_file *k,char *pin)
|
|
|
|
{
|
|
|
|
if (!k) return WHY("k is null");
|
|
|
|
if (k->context_count>=KEYRING_MAX_CONTEXTS)
|
|
|
|
return WHY("Too many loaded contexts already");
|
|
|
|
if (k->context_count<1)
|
|
|
|
return WHY("Cannot enter PIN without keyring salt being available");
|
|
|
|
|
|
|
|
k->contexts[k->context_count]=calloc(sizeof(keyring_context),1);
|
|
|
|
if (!k->contexts[k->context_count]) return WHY("Could not allocate new keyring context structure");
|
|
|
|
keyring_context *c=k->contexts[k->context_count];
|
|
|
|
/* Store pin */
|
2012-04-12 04:30:51 +00:00
|
|
|
c->KeyRingPin=pin?strdup(pin):strdup("");
|
2012-04-10 04:19:18 +00:00
|
|
|
/* Get salt from the zeroeth context */
|
|
|
|
c->KeyRingSalt=malloc(k->contexts[0]->KeyRingSaltLen);
|
|
|
|
if (!c->KeyRingSalt) {
|
|
|
|
free(c); k->contexts[k->context_count]=NULL;
|
|
|
|
return WHY("Could not copy keyring salt from context zero");
|
|
|
|
}
|
|
|
|
c->KeyRingSaltLen=k->contexts[0]->KeyRingSaltLen;
|
|
|
|
bcopy(&k->contexts[0]->KeyRingSalt[0],&c->KeyRingSalt[0],c->KeyRingSaltLen);
|
|
|
|
k->context_count++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-10 21:20:57 +00:00
|
|
|
/* Enter an identity pin and search for matching records.
|
|
|
|
This involves going through the bitmap for each slab, and
|
|
|
|
then trying each keyring pin and identity pin with each
|
|
|
|
record marked as allocated.
|
|
|
|
We might find more than one matching identity, and that's okay;
|
|
|
|
we just load them all.
|
|
|
|
*/
|
|
|
|
int keyring_enter_identitypin(keyring_file *k,char *pin)
|
|
|
|
{
|
|
|
|
if (!k) return WHY("k is null");
|
|
|
|
|
|
|
|
return WHY("Not implemented");
|
|
|
|
}
|
2012-04-10 04:19:18 +00:00
|
|
|
|
2012-04-10 21:20:57 +00:00
|
|
|
/*
|
|
|
|
En/Decrypting a block requires use of the first 32 bytes of the block to provide
|
|
|
|
salt. The next 64 bytes constitute a message authentication code (MAC) that is
|
|
|
|
used to verify the validity of the block. The verification occurs in a higher
|
|
|
|
level function, and all we need to know here is that we shouldn't decrypt the
|
|
|
|
first 96 bytes of the block.
|
2012-04-12 04:30:51 +00:00
|
|
|
*/
|
2012-04-10 21:20:57 +00:00
|
|
|
int keyring_munge_block(unsigned char *block,int len /* includes the first 96 bytes */,
|
|
|
|
unsigned char *KeyRingSalt,int KeyRingSaltLen,
|
|
|
|
char *KeyRingPin,char *PKRPin)
|
|
|
|
{
|
|
|
|
int exit_code=1;
|
|
|
|
unsigned char hashKey[crypto_hash_sha512_BYTES];
|
|
|
|
unsigned char hashNonce[crypto_hash_sha512_BYTES];
|
|
|
|
|
|
|
|
unsigned char work[65536];
|
|
|
|
int ofs;
|
|
|
|
|
|
|
|
if (len<96) return WHY("block too short");
|
|
|
|
|
|
|
|
unsigned char *PKRSalt=&block[0];
|
|
|
|
int PKRSaltLen=32;
|
|
|
|
|
2012-04-11 06:17:22 +00:00
|
|
|
#if crypto_stream_xsalsa20_KEYBYTES>crypto_hash_sha512_BYTES
|
|
|
|
#error crypto primitive key size too long -- hash needs to be expanded
|
|
|
|
#endif
|
|
|
|
#if crypto_stream_xsalsa20_NONCEBYTES>crypto_hash_sha512_BYTES
|
|
|
|
#error crypto primitive nonce size too long -- hash needs to be expanded
|
|
|
|
#endif
|
|
|
|
|
2012-04-10 21:20:57 +00:00
|
|
|
/* Generate key and nonce hashes from the various inputs */
|
|
|
|
#define APPEND(b,l) if (ofs+(l)>=65536) { WHY("Input too long"); goto kmb_safeexit; } bcopy((b),&work[ofs],(l)); ofs+=(l)
|
|
|
|
|
|
|
|
/* Form key as hash of various concatenated inputs.
|
|
|
|
The ordering and repetition of the inputs is designed to make rainbow tables
|
|
|
|
infeasible */
|
|
|
|
ofs=0;
|
|
|
|
APPEND(PKRSalt,PKRSaltLen);
|
|
|
|
APPEND(PKRPin,strlen(PKRPin));
|
|
|
|
APPEND(PKRSalt,PKRSaltLen);
|
|
|
|
APPEND(KeyRingPin,strlen(KeyRingPin));
|
|
|
|
crypto_hash_sha512(hashKey,work,ofs);
|
|
|
|
|
|
|
|
/* Form the nonce as hash of various other concatenated inputs */
|
|
|
|
ofs=0;
|
|
|
|
APPEND(KeyRingPin,strlen(KeyRingPin));
|
|
|
|
APPEND(KeyRingSalt,KeyRingSaltLen);
|
|
|
|
APPEND(KeyRingPin,strlen(KeyRingPin));
|
|
|
|
APPEND(PKRPin,strlen(PKRPin));
|
|
|
|
crypto_hash_sha512(hashNonce,work,ofs);
|
|
|
|
|
2012-04-11 06:17:22 +00:00
|
|
|
/* Now en/de-crypt the remainder of the block.
|
|
|
|
We do this in-place for convenience, so you should not pass in a mmap()'d
|
|
|
|
lump. */
|
|
|
|
crypto_stream_xsalsa20_xor(&block[96],&block[96],len-96,
|
|
|
|
hashNonce,hashKey);
|
|
|
|
exit_code=0;
|
2012-04-10 21:20:57 +00:00
|
|
|
|
|
|
|
kmb_safeexit:
|
|
|
|
/* Wipe out all sensitive structures before returning */
|
2012-04-11 06:17:22 +00:00
|
|
|
ofs=0;
|
2012-04-10 21:20:57 +00:00
|
|
|
bzero(&work[0],65536);
|
|
|
|
bzero(&hashKey[0],crypto_hash_sha512_BYTES);
|
|
|
|
bzero(&hashNonce[0],crypto_hash_sha512_BYTES);
|
|
|
|
return exit_code;
|
2012-04-11 21:24:51 +00:00
|
|
|
#undef APPEND
|
2012-04-10 21:20:57 +00:00
|
|
|
}
|
2012-04-11 06:17:22 +00:00
|
|
|
|
2012-04-12 04:30:51 +00:00
|
|
|
#define slot_byte(X) slot[((PKR_SALT_BYTES+PKR_MAC_BYTES+2)+((X)+rotation)%(KEYRING_PAGE_SIZE-(PKR_SALT_BYTES+PKR_MAC_BYTES+2)))]
|
2012-04-12 03:02:01 +00:00
|
|
|
int keyring_pack_identity(keyring_context *c,keyring_identity *i,
|
|
|
|
unsigned char packed[KEYRING_PAGE_SIZE])
|
|
|
|
{
|
|
|
|
int ofs=0;
|
|
|
|
int exit_code=-1;
|
|
|
|
|
|
|
|
/* Convert an identity to a KEYRING_PAGE_SIZE bytes long block that
|
|
|
|
consists of 32 bytes of random salt, a 64 byte (512 bit) message
|
|
|
|
authentication code (MAC) and the list of key pairs. */
|
|
|
|
if (urandombytes(&packed[0],PKR_SALT_BYTES)) return WHY("Could not generate salt");
|
|
|
|
ofs+=PKR_SALT_BYTES;
|
|
|
|
/* Calculate MAC */
|
|
|
|
keyring_identity_mac(c,i,&packed[0] /* pkr salt */,
|
|
|
|
&packed[0+PKR_SALT_BYTES] /* write mac in after salt */);
|
2012-04-12 04:30:51 +00:00
|
|
|
ofs+=PKR_MAC_BYTES;
|
|
|
|
|
|
|
|
/* Leave 2 bytes for rotation (put zeroes for now) */
|
|
|
|
int rotate_ofs=ofs;
|
|
|
|
packed[ofs]=0; packed[ofs+1]=0;
|
|
|
|
ofs+=2;
|
2012-04-12 03:02:01 +00:00
|
|
|
|
|
|
|
/* Write keypairs */
|
|
|
|
int kp;
|
|
|
|
for(kp=0;kp<i->keypair_count;kp++)
|
|
|
|
{
|
|
|
|
if (ofs>=KEYRING_PAGE_SIZE) {
|
|
|
|
WHY("too many or too long key pairs");
|
|
|
|
ofs=0; goto kpi_safeexit;
|
|
|
|
}
|
|
|
|
packed[ofs++]=i->keypairs[kp]->type;
|
|
|
|
switch(i->keypairs[kp]->type) {
|
2012-04-12 07:48:28 +00:00
|
|
|
case KEYTYPE_RHIZOME:
|
|
|
|
case KEYTYPE_DID:
|
|
|
|
/* Both of these are 32 bytes and only one value,
|
|
|
|
so the CRYPTOBOX case below works */
|
|
|
|
/* fall through */
|
2012-04-12 03:02:01 +00:00
|
|
|
case KEYTYPE_CRYPTOBOX:
|
|
|
|
/* For cryptobox we only need the private key, as we compute the public
|
|
|
|
key from it when extracting the identity */
|
|
|
|
if ((ofs+i->keypairs[kp]->private_key_len)>=KEYRING_PAGE_SIZE)
|
|
|
|
{
|
|
|
|
WHY("too many or too long key pairs");
|
|
|
|
ofs=0;
|
|
|
|
goto kpi_safeexit;
|
|
|
|
}
|
|
|
|
bcopy(i->keypairs[kp]->private_key,&packed[ofs],
|
|
|
|
i->keypairs[kp]->private_key_len);
|
|
|
|
ofs+=i->keypairs[kp]->private_key_len;
|
|
|
|
break;
|
|
|
|
case KEYTYPE_CRYPTOSIGN:
|
|
|
|
/* For cryptosign keys there is no public API in NaCl to compute the
|
|
|
|
public key from the private key (although we could subvert the API
|
|
|
|
abstraction and do it anyway). But in the interests of niceness we
|
|
|
|
just store the public and private key pair together */
|
|
|
|
if ((ofs
|
|
|
|
+i->keypairs[kp]->private_key_len
|
|
|
|
+i->keypairs[kp]->public_key_len)>=KEYRING_PAGE_SIZE)
|
|
|
|
{
|
|
|
|
WHY("too many or too long key pairs");
|
|
|
|
ofs=0;
|
|
|
|
goto kpi_safeexit;
|
|
|
|
}
|
|
|
|
/* Write private then public */
|
|
|
|
bcopy(i->keypairs[kp]->private_key,&packed[ofs],
|
|
|
|
i->keypairs[kp]->private_key_len);
|
|
|
|
ofs+=i->keypairs[kp]->private_key_len;
|
|
|
|
bcopy(i->keypairs[kp]->public_key,&packed[ofs],
|
|
|
|
i->keypairs[kp]->public_key_len);
|
|
|
|
ofs+=i->keypairs[kp]->public_key_len;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
WHY("unknown key type");
|
|
|
|
goto kpi_safeexit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ofs>=KEYRING_PAGE_SIZE) {
|
|
|
|
WHY("too many or too long key pairs");
|
|
|
|
ofs=0; goto kpi_safeexit;
|
|
|
|
}
|
|
|
|
packed[ofs++]=0x00; /* Terminate block */
|
|
|
|
|
|
|
|
/* We are now all done, give or take the zeroeing of the trailing bytes. */
|
|
|
|
exit_code=0;
|
|
|
|
|
|
|
|
|
|
|
|
kpi_safeexit:
|
|
|
|
/* Clear out remainder of block so that we don't leak info.
|
|
|
|
We could have zeroed the thing to begin with, but that means extra
|
|
|
|
memory writes that are otherwise avoidable.
|
|
|
|
Actually, we don't want zeroes (known plain-text attack against most
|
|
|
|
of the block's contents in the typical case), we want random data. */
|
|
|
|
if (urandombytes(&packed[ofs],KEYRING_PAGE_SIZE-ofs))
|
|
|
|
return WHY("urandombytes() failed to back-fill packed identity block");
|
|
|
|
|
2012-04-12 04:30:51 +00:00
|
|
|
/* Rotate block by a random amount (get the randomness safely) */
|
|
|
|
unsigned int rotation;
|
|
|
|
if (urandombytes((unsigned char *)&rotation,sizeof(rotation)))
|
|
|
|
return WHY("urandombytes() failed to generate random rotation");
|
|
|
|
rotation&=0xffff;
|
2012-04-12 06:22:41 +00:00
|
|
|
#ifdef NO_ROTATION
|
|
|
|
rotation=0;
|
|
|
|
#endif
|
2012-04-12 04:30:51 +00:00
|
|
|
unsigned char slot[KEYRING_PAGE_SIZE];
|
|
|
|
/* XXX There has to be a more efficient way to do this! */
|
|
|
|
int n;
|
|
|
|
for(n=0;n<(KEYRING_PAGE_SIZE-(PKR_SALT_BYTES+PKR_MAC_BYTES+2));n++)
|
|
|
|
slot_byte(n)=packed[PKR_SALT_BYTES+PKR_MAC_BYTES+2+n];
|
|
|
|
bcopy(&slot[PKR_SALT_BYTES+PKR_MAC_BYTES+2],&packed[PKR_SALT_BYTES+PKR_MAC_BYTES+2],
|
|
|
|
KEYRING_PAGE_SIZE-(PKR_SALT_BYTES+PKR_MAC_BYTES+2));
|
|
|
|
packed[rotate_ofs]=rotation>>8;
|
|
|
|
packed[rotate_ofs+1]=rotation&0xff;
|
|
|
|
|
2012-04-12 03:02:01 +00:00
|
|
|
return exit_code;
|
|
|
|
}
|
|
|
|
|
2012-04-12 06:22:41 +00:00
|
|
|
keyring_identity *keyring_unpack_identity(unsigned char *slot,char *pin)
|
2012-04-11 06:17:22 +00:00
|
|
|
{
|
|
|
|
/* Skip salt and MAC */
|
|
|
|
int i;
|
|
|
|
int ofs;
|
|
|
|
keyring_identity *id=calloc(sizeof(keyring_identity),1);
|
|
|
|
if (!id) { WHY("calloc() of identity failed"); return NULL; }
|
|
|
|
if (!slot) { WHY("slot is null"); return NULL; }
|
|
|
|
|
2012-04-12 06:22:41 +00:00
|
|
|
id->PKRPin=strdup(pin);
|
|
|
|
|
2012-04-11 06:17:22 +00:00
|
|
|
/* There was a known plain-text opportunity here:
|
|
|
|
byte 96 must be 0x01, and some other bytes are likely deducible, e.g., the
|
|
|
|
location of the trailing 0x00 byte can probably be guessed with confidence.
|
|
|
|
Payload rotation would help here. So let's do that. First two bytes is
|
|
|
|
rotation in bytes of remainder of block.
|
|
|
|
*/
|
|
|
|
|
2012-04-12 06:22:41 +00:00
|
|
|
int rotation=(slot[PKR_SALT_BYTES+PKR_MAC_BYTES]<<8)
|
|
|
|
|slot[PKR_SALT_BYTES+PKR_MAC_BYTES+1];
|
|
|
|
ofs=PKR_SALT_BYTES+PKR_MAC_BYTES+2;
|
2012-04-11 06:17:22 +00:00
|
|
|
|
|
|
|
/* Parse block */
|
2012-04-12 06:22:41 +00:00
|
|
|
for(ofs=0;ofs<(KEYRING_PAGE_SIZE-PKR_SALT_BYTES-PKR_MAC_BYTES-2);)
|
2012-04-11 06:17:22 +00:00
|
|
|
{
|
|
|
|
switch(slot_byte(ofs)) {
|
|
|
|
case 0x00:
|
2012-04-12 06:22:41 +00:00
|
|
|
/* End of data, stop looking */
|
|
|
|
ofs=KEYRING_PAGE_SIZE;
|
2012-04-11 06:17:22 +00:00
|
|
|
break;
|
2012-04-12 07:48:28 +00:00
|
|
|
case KEYTYPE_RHIZOME:
|
|
|
|
case KEYTYPE_DID:
|
2012-04-11 06:17:22 +00:00
|
|
|
case KEYTYPE_CRYPTOBOX:
|
|
|
|
case KEYTYPE_CRYPTOSIGN:
|
|
|
|
if (id->keypair_count>=PKR_MAX_KEYPAIRS) {
|
|
|
|
WHY("Too many key pairs in identity");
|
|
|
|
keyring_free_identity(id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
keypair *kp=id->keypairs[id->keypair_count]=calloc(sizeof(keypair),1);
|
|
|
|
if (!id->keypairs[id->keypair_count]) {
|
|
|
|
WHY("calloc() of key pair structure failed.");
|
|
|
|
keyring_free_identity(id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
kp->type=slot_byte(ofs);
|
|
|
|
switch(kp->type) {
|
|
|
|
case KEYTYPE_CRYPTOBOX:
|
|
|
|
kp->private_key_len=crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES;
|
|
|
|
kp->public_key_len=crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES;
|
|
|
|
break;
|
|
|
|
case KEYTYPE_CRYPTOSIGN:
|
|
|
|
kp->private_key_len=crypto_sign_edwards25519sha512batch_SECRETKEYBYTES;
|
|
|
|
kp->public_key_len=crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
|
|
|
|
break;
|
2012-04-12 07:48:28 +00:00
|
|
|
case KEYTYPE_RHIZOME: case KEYTYPE_DID:
|
|
|
|
kp->private_key_len=32; kp->public_key_len=0;
|
|
|
|
break;
|
2012-04-11 06:17:22 +00:00
|
|
|
}
|
|
|
|
kp->private_key=malloc(kp->private_key_len);
|
|
|
|
if (!kp->private_key) {
|
|
|
|
WHY("malloc() of private key storage failed.");
|
|
|
|
keyring_free_identity(id);
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-12 06:22:41 +00:00
|
|
|
for(i=0;i<kp->private_key_len;i++) kp->private_key[i]=slot_byte(ofs+1+i);
|
|
|
|
kp->public_key=malloc(kp->public_key_len);
|
|
|
|
if (!kp->public_key) {
|
|
|
|
WHY("malloc() of public key storage failed.");
|
2012-04-11 06:17:22 +00:00
|
|
|
keyring_free_identity(id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Hop over the private key and token that we have read */
|
|
|
|
ofs+=1+kp->private_key_len;
|
|
|
|
switch(kp->type) {
|
|
|
|
case KEYTYPE_CRYPTOBOX:
|
|
|
|
/* Compute public key from private key.
|
|
|
|
|
|
|
|
Public key calculation as below is taken from section 3 of:
|
|
|
|
http://cr.yp.to/highspeed/naclcrypto-20090310.pdf
|
|
|
|
|
|
|
|
XXX - This can take a while on a mobile phone since it involves a
|
|
|
|
scalarmult operation, so searching through all slots for a pin could
|
|
|
|
take a while (perhaps 1 second per pin:slot cominbation).
|
|
|
|
This is both good and bad. The other option is to store
|
|
|
|
the public key as well, which would make entering a pin faster, but
|
|
|
|
would also make trying an incorrect pin faster, thus simplifying some
|
|
|
|
brute-force attacks. We need to make a decision between speed/convenience
|
|
|
|
and security here.
|
|
|
|
*/
|
|
|
|
crypto_scalarmult_curve25519_base(kp->public_key,kp->private_key);
|
|
|
|
break;
|
|
|
|
case KEYTYPE_CRYPTOSIGN:
|
|
|
|
/* While it is possible to compute the public key from the private key,
|
|
|
|
NaCl currently does not provide a function to do this, so we have to
|
|
|
|
store it, or else subvert the NaCl API, which I would rather not do.
|
|
|
|
*/
|
|
|
|
for(i=0;i<kp->public_key_len;i++) kp->public_key[i]=slot_byte(ofs+i);
|
|
|
|
ofs+=kp->public_key_len;
|
|
|
|
break;
|
2012-04-12 07:48:28 +00:00
|
|
|
case KEYTYPE_RHIZOME: case KEYTYPE_DID:
|
|
|
|
/* no public key value for these, just do nothing */
|
|
|
|
break;
|
2012-04-11 06:17:22 +00:00
|
|
|
}
|
2012-04-12 06:22:41 +00:00
|
|
|
id->keypair_count++;
|
2012-04-11 06:17:22 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Invalid data, so invalid record. Free and return failure.
|
|
|
|
We don't complain about this, however, as it is the natural
|
|
|
|
effect of trying a pin on an incorrect keyring slot. */
|
2012-04-12 13:45:21 +00:00
|
|
|
keyring_free_identity(id);
|
2012-04-11 06:17:22 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2012-04-12 06:22:41 +00:00
|
|
|
|
2012-04-11 06:17:22 +00:00
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2012-04-12 03:02:01 +00:00
|
|
|
int keyring_identity_mac(keyring_context *c,keyring_identity *id,
|
|
|
|
unsigned char *pkrsalt,unsigned char *mac)
|
|
|
|
{
|
|
|
|
int ofs;
|
|
|
|
unsigned char work[65536];
|
|
|
|
#define APPEND(b,l) if (ofs+(l)>=65536) { bzero(work,ofs); return WHY("Input too long"); } bcopy((b),&work[ofs],(l)); ofs+=(l)
|
|
|
|
|
|
|
|
ofs=0;
|
|
|
|
APPEND(&pkrsalt[0],32);
|
|
|
|
APPEND(id->keypairs[0]->private_key,id->keypairs[0]->private_key_len);
|
|
|
|
APPEND(id->keypairs[0]->public_key,id->keypairs[0]->public_key_len);
|
|
|
|
APPEND(id->PKRPin,strlen(id->PKRPin));
|
|
|
|
crypto_hash_sha512(mac,work,ofs);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-04-11 06:17:22 +00:00
|
|
|
/* Read the slot, and try to decrypt it.
|
|
|
|
Decryption is symmetric with encryption, so the same function is used
|
|
|
|
for munging the slot before making use of it, whichever way we are going.
|
|
|
|
Once munged, we then need to verify that the slot is valid, and if so
|
|
|
|
unpack the details of the identity.
|
|
|
|
*/
|
|
|
|
int keyring_decrypt_pkr(keyring_file *k,keyring_context *c,
|
|
|
|
char *pin,int slot_number)
|
|
|
|
{
|
|
|
|
int exit_code=1;
|
|
|
|
unsigned char slot[KEYRING_PAGE_SIZE];
|
2012-04-11 21:24:51 +00:00
|
|
|
unsigned char hash[crypto_hash_sha512_BYTES];
|
2012-04-11 06:17:22 +00:00
|
|
|
unsigned char work[65536];
|
|
|
|
keyring_identity *id=NULL;
|
|
|
|
|
|
|
|
/* 1. Read slot. */
|
|
|
|
if (fseeko(k->file,slot_number*KEYRING_PAGE_SIZE,SEEK_SET))
|
|
|
|
return WHY("fseeko() failed");
|
|
|
|
if (fread(&slot[0],KEYRING_PAGE_SIZE,1,k->file)!=1)
|
|
|
|
return WHY("read() failed");
|
|
|
|
/* 2. Decrypt data from slot. */
|
|
|
|
if (keyring_munge_block(slot,KEYRING_PAGE_SIZE,
|
|
|
|
k->contexts[0]->KeyRingSalt,
|
|
|
|
k->contexts[0]->KeyRingSaltLen,
|
|
|
|
c->KeyRingPin,pin)) {
|
|
|
|
WHY("keyring_munge_block() failed");
|
|
|
|
goto kdp_safeexit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 3. Unpack contents of slot into a new identity in the provided context. */
|
2012-04-12 06:22:41 +00:00
|
|
|
id=keyring_unpack_identity(slot,pin);
|
2012-04-11 06:17:22 +00:00
|
|
|
if (!id) {
|
2012-04-12 13:45:21 +00:00
|
|
|
// Don't complain, because this happens routinely when trying pins against slots.
|
|
|
|
// WHY("keyring_unpack_identity() failed");
|
2012-04-11 06:17:22 +00:00
|
|
|
goto kdp_safeexit;
|
|
|
|
}
|
2012-04-12 13:45:21 +00:00
|
|
|
id->slot=slot_number;
|
2012-04-11 06:17:22 +00:00
|
|
|
|
|
|
|
/* 4. Verify that slot is self-consistent (check MAC) */
|
2012-04-12 03:02:01 +00:00
|
|
|
if (keyring_identity_mac(k->contexts[0],id,&slot[0],hash)) {
|
|
|
|
WHY("could not calculate MAC for identity");
|
|
|
|
goto kdp_safeexit;
|
|
|
|
}
|
2012-04-11 21:24:51 +00:00
|
|
|
/* compare hash to record */
|
|
|
|
if (bcmp(hash,&slot[32],crypto_hash_sha512_BYTES))
|
2012-04-12 06:22:41 +00:00
|
|
|
{
|
2012-04-11 21:24:51 +00:00
|
|
|
WHY("Slot is not valid (MAC mismatch)");
|
2012-04-12 06:22:41 +00:00
|
|
|
dump("computed",hash,crypto_hash_sha512_BYTES);
|
|
|
|
dump("stored",&slot[32],crypto_hash_sha512_BYTES);
|
2012-04-11 21:24:51 +00:00
|
|
|
goto kdp_safeexit;
|
|
|
|
}
|
|
|
|
/* Well, it's all fine, so add the id into the context and return */
|
|
|
|
c->identities[c->identity_count++]=id;
|
|
|
|
return 0;
|
2012-04-11 06:17:22 +00:00
|
|
|
|
|
|
|
WHY("Not implemented");
|
|
|
|
kdp_safeexit:
|
|
|
|
/* Clean up any potentially sensitive data before exiting */
|
|
|
|
bzero(slot,KEYRING_PAGE_SIZE);
|
2012-04-11 21:24:51 +00:00
|
|
|
bzero(hash,crypto_hash_sha512_BYTES);
|
2012-04-11 06:17:22 +00:00
|
|
|
bzero(&work[0],65536);
|
|
|
|
if (id) keyring_free_identity(id); id=NULL;
|
|
|
|
return exit_code;
|
|
|
|
}
|
|
|
|
|
2012-04-11 22:21:53 +00:00
|
|
|
/* Try all valid slots with the PIN and see if we find any identities with that PIN.
|
|
|
|
We might find more than one. */
|
|
|
|
int keyring_enter_pin(keyring_file *k,char *pin)
|
|
|
|
{
|
|
|
|
if (!k) return -1;
|
|
|
|
if (!pin) pin="";
|
|
|
|
|
|
|
|
int slot;
|
|
|
|
int identitiesFound=0;
|
|
|
|
|
|
|
|
for(slot=0;slot<k->file_size/KEYRING_PAGE_SIZE;slot++)
|
|
|
|
{
|
2012-04-12 04:30:51 +00:00
|
|
|
/* slot zero is the BAM and salt, so skip it */
|
2012-04-11 22:21:53 +00:00
|
|
|
if (slot&(KEYRING_BAM_BITS-1)) {
|
|
|
|
/* Not a BAM slot, so examine */
|
|
|
|
off_t file_offset=slot*KEYRING_PAGE_SIZE;
|
|
|
|
|
|
|
|
/* See if this part of the keyring file is organised */
|
|
|
|
keyring_bam *b=k->bam;
|
|
|
|
while (b&&(file_offset>=b->file_offset+KEYRING_SLAB_SIZE))
|
|
|
|
b=b->next;
|
|
|
|
if (!b) continue;
|
|
|
|
|
|
|
|
/* Now see if slot is marked in-use. No point checking unallocated slots,
|
|
|
|
especially since the cost can be upto a second of CPU time on a phone. */
|
|
|
|
int position=slot&(KEYRING_BAM_BITS-1);
|
|
|
|
int byte=position>>3;
|
|
|
|
int bit=position&7;
|
|
|
|
if (b->bitmap[byte]&(1<<bit)) {
|
|
|
|
/* Slot is occupied, so check it.
|
|
|
|
We have to check it for each keyring context (ie keyring pin) */
|
|
|
|
int c;
|
|
|
|
for(c=0;c<k->context_count;c++)
|
|
|
|
{
|
2012-04-12 06:22:41 +00:00
|
|
|
int result=keyring_decrypt_pkr(k,k->contexts[c],pin?pin:"",slot);
|
2012-04-11 22:21:53 +00:00
|
|
|
if (!result) identitiesFound++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the caller how many identities we found */
|
|
|
|
return identitiesFound;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a new identity in the specified context (which supplies the keyring pin)
|
|
|
|
with the specified PKR pin.
|
|
|
|
The crypto_box and crypto_sign key pairs are automatically created, and the PKR
|
|
|
|
is packed and written to a hithero unallocated slot which is then marked full.
|
|
|
|
*/
|
2012-04-12 23:55:03 +00:00
|
|
|
keyring_identity *keyring_create_identity(keyring_file *k,keyring_context *c,char *pin)
|
2012-04-11 22:21:53 +00:00
|
|
|
{
|
2012-04-12 03:02:01 +00:00
|
|
|
/* Check obvious abort conditions early */
|
2012-04-12 23:55:03 +00:00
|
|
|
if (!k) { WHY("keyring is NULL"); return NULL; }
|
|
|
|
if (!k->bam) { WHY("keyring lacks BAM (not to be confused with KAPOW)"); return NULL; }
|
|
|
|
if (!c) { WHY("keyring context is NULL"); return NULL; }
|
|
|
|
if (c->identity_count>=KEYRING_MAX_IDENTITIES)
|
|
|
|
{ WHY("keyring context has too many identities"); return NULL; }
|
2012-04-12 03:02:01 +00:00
|
|
|
|
2012-04-11 22:21:53 +00:00
|
|
|
if (!pin) pin="";
|
|
|
|
|
|
|
|
keyring_identity *id=calloc(sizeof(keyring_identity),1);
|
2012-04-12 23:55:03 +00:00
|
|
|
if (!id) { WHY("calloc() failed"); return NULL; }
|
|
|
|
|
2012-04-11 22:21:53 +00:00
|
|
|
/* Store pin */
|
|
|
|
id->PKRPin=strdup(pin);
|
|
|
|
if (!id->PKRPin) {
|
|
|
|
WHY("Could not store pin");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
|
2012-04-12 04:30:51 +00:00
|
|
|
/* Find free slot in keyring.
|
|
|
|
Slot 0 in any slab is the BAM and possible keyring salt, so only search for
|
|
|
|
space in slots 1 and above. */
|
2012-04-11 22:21:53 +00:00
|
|
|
/* XXX Only stores to first slab! */
|
2012-04-12 04:30:51 +00:00
|
|
|
keyring_bam *b=k->bam;
|
|
|
|
for(id->slot=1;id->slot<KEYRING_BAM_BITS;id->slot++)
|
2012-04-11 22:21:53 +00:00
|
|
|
{
|
|
|
|
int position=id->slot&(KEYRING_BAM_BITS-1);
|
|
|
|
int byte=position>>3;
|
|
|
|
int bit=position&7;
|
|
|
|
if (!(b->bitmap[byte]&(1<<bit)))
|
|
|
|
/* found a free slot */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (id->slot>=KEYRING_BAM_BITS) {
|
|
|
|
WHY("no free slots in first slab (and I don't know how to store in subsequent slabs yet");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate key pairs */
|
|
|
|
|
|
|
|
/* crypto_box key pair */
|
|
|
|
id->keypairs[0]=calloc(sizeof(keypair),1);
|
|
|
|
if (!id->keypairs[0]) {
|
|
|
|
WHY("calloc() failed preparing first key pair storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypair_count=1;
|
|
|
|
id->keypairs[0]->type=KEYTYPE_CRYPTOBOX;
|
|
|
|
id->keypairs[0]->private_key_len=crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES;
|
|
|
|
id->keypairs[0]->private_key=malloc(id->keypairs[0]->private_key_len);
|
|
|
|
if (!id->keypairs[0]->private_key) {
|
|
|
|
WHY("malloc() failed preparing first private key storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypairs[0]->public_key_len=crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES;
|
|
|
|
id->keypairs[0]->public_key=malloc(id->keypairs[0]->public_key_len);
|
|
|
|
if (!id->keypairs[0]->public_key) {
|
|
|
|
WHY("malloc() failed preparing first public key storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
crypto_box_curve25519xsalsa20poly1305_keypair(id->keypairs[0]->public_key,
|
|
|
|
id->keypairs[0]->private_key);
|
|
|
|
|
|
|
|
/* crypto_box key pair */
|
|
|
|
id->keypairs[1]=calloc(sizeof(keypair),1);
|
|
|
|
if (!id->keypairs[1]) {
|
|
|
|
WHY("calloc() failed preparing second key pair storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypair_count=2;
|
|
|
|
id->keypairs[1]->type=KEYTYPE_CRYPTOSIGN;
|
|
|
|
id->keypairs[1]->private_key_len=crypto_sign_edwards25519sha512batch_SECRETKEYBYTES;
|
|
|
|
id->keypairs[1]->private_key=malloc(id->keypairs[1]->private_key_len);
|
|
|
|
if (!id->keypairs[1]->private_key) {
|
|
|
|
WHY("malloc() failed preparing second private key storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypairs[1]->public_key_len=crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES;
|
|
|
|
id->keypairs[1]->public_key=malloc(id->keypairs[1]->public_key_len);
|
|
|
|
if (!id->keypairs[1]->public_key) {
|
|
|
|
WHY("malloc() failed preparing second public key storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
crypto_sign_edwards25519sha512batch_keypair(id->keypairs[1]->public_key,
|
|
|
|
id->keypairs[1]->private_key);
|
|
|
|
|
2012-04-12 07:31:25 +00:00
|
|
|
/* Rhizome Secret (for protecting Bundle Private Keys) */
|
|
|
|
id->keypairs[2]=calloc(sizeof(keypair),1);
|
|
|
|
if (!id->keypairs[2]) {
|
|
|
|
WHY("calloc() failed preparing second key pair storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypair_count=3;
|
|
|
|
id->keypairs[2]->type=KEYTYPE_RHIZOME;
|
|
|
|
id->keypairs[2]->private_key_len=32;
|
|
|
|
id->keypairs[2]->private_key=malloc(id->keypairs[2]->private_key_len);
|
|
|
|
if (!id->keypairs[2]->private_key) {
|
|
|
|
WHY("malloc() failed preparing second private key storage");
|
|
|
|
goto kci_safeexit;
|
|
|
|
}
|
|
|
|
id->keypairs[2]->public_key_len=0;
|
|
|
|
id->keypairs[2]->public_key=NULL;
|
|
|
|
urandombytes(id->keypairs[2]->private_key,id->keypairs[2]->private_key_len);
|
|
|
|
|
2012-04-12 03:02:01 +00:00
|
|
|
/* Mark slot in use */
|
|
|
|
int position=id->slot&(KEYRING_BAM_BITS-1);
|
|
|
|
int byte=position>>3;
|
|
|
|
int bit=position&7;
|
|
|
|
b->bitmap[byte]|=(1<<bit);
|
2012-04-11 22:21:53 +00:00
|
|
|
|
2012-04-12 03:02:01 +00:00
|
|
|
/* Add identity to data structure */
|
|
|
|
c->identities[c->identity_count++]=id;
|
2012-04-11 22:21:53 +00:00
|
|
|
|
2012-04-12 04:30:51 +00:00
|
|
|
/* We require explicit calling of keyring_commit(), since that seems
|
|
|
|
more sensible */
|
|
|
|
#ifdef NOTDEFINED
|
2012-04-12 03:02:01 +00:00
|
|
|
/* Commit keyring to disk */
|
|
|
|
if (keyring_commit(k))
|
|
|
|
{
|
|
|
|
/* Write to disk failed, so unlink identity and clear allocation and generally
|
|
|
|
clean up the mess. */
|
|
|
|
b->bitmap[byte]&=0xff-(1<<bit);
|
|
|
|
/* Add identity to data structure */
|
|
|
|
c->identities[--c->identity_count]=NULL;
|
|
|
|
}
|
|
|
|
else
|
2012-04-12 04:30:51 +00:00
|
|
|
#endif
|
2012-04-12 03:02:01 +00:00
|
|
|
/* Everything went fine */
|
2012-04-12 23:55:03 +00:00
|
|
|
return id;
|
2012-04-11 22:21:53 +00:00
|
|
|
|
|
|
|
kci_safeexit:
|
|
|
|
if (id) keyring_free_identity(id);
|
2012-04-12 23:55:03 +00:00
|
|
|
return NULL;
|
2012-04-11 22:21:53 +00:00
|
|
|
}
|
2012-04-12 03:02:01 +00:00
|
|
|
|
|
|
|
int keyring_commit(keyring_file *k)
|
|
|
|
{
|
|
|
|
int errorCount=0;
|
|
|
|
if (!k) return WHY("keyring was NULL");
|
|
|
|
if (k->context_count<1) return WHY("Keyring has no contexts");
|
|
|
|
|
|
|
|
/* Write all BAMs */
|
|
|
|
keyring_bam *b=k->bam;
|
|
|
|
while (b) {
|
|
|
|
if (fseeko(k->file,b->file_offset,SEEK_SET)==0)
|
|
|
|
{
|
2012-04-12 04:30:51 +00:00
|
|
|
if (fwrite(b->bitmap,KEYRING_BAM_BYTES,1,k->file)!=1) errorCount++;
|
2012-04-12 03:02:01 +00:00
|
|
|
else
|
2012-04-12 04:30:51 +00:00
|
|
|
if (fwrite(k->contexts[0]->KeyRingSalt,k->contexts[0]->KeyRingSaltLen,1,
|
|
|
|
k->file)!=1) errorCount++;
|
2012-04-12 03:02:01 +00:00
|
|
|
}
|
|
|
|
else errorCount++;
|
|
|
|
b=b->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For each identity in each context, write the record to disk.
|
|
|
|
This re-salts every identity as it is re-written, and the pin
|
|
|
|
for each identity and context is used, so changing a keypair or pin
|
|
|
|
is as simple as updating the keyring_identity or related structure,
|
|
|
|
and then calling this function. */
|
|
|
|
int cn,in;
|
|
|
|
for(cn=0;cn<k->context_count;cn++)
|
|
|
|
for(in=0;in<k->contexts[cn]->identity_count;in++)
|
|
|
|
{
|
2012-04-12 03:23:37 +00:00
|
|
|
unsigned char pkr[KEYRING_PAGE_SIZE];
|
|
|
|
if (keyring_pack_identity(k->contexts[cn],
|
|
|
|
k->contexts[cn]->identities[in],
|
|
|
|
pkr))
|
|
|
|
errorCount++;
|
|
|
|
else {
|
|
|
|
/* Now crypt and store block */
|
|
|
|
/* Crypt */
|
|
|
|
if (keyring_munge_block(pkr,
|
|
|
|
KEYRING_PAGE_SIZE,
|
|
|
|
k->contexts[cn]->KeyRingSalt,
|
|
|
|
k->contexts[cn]->KeyRingSaltLen,
|
|
|
|
k->contexts[cn]->KeyRingPin,
|
|
|
|
k->contexts[cn]->identities[in]->PKRPin))
|
|
|
|
errorCount++;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Store */
|
|
|
|
off_t file_offset
|
|
|
|
=KEYRING_PAGE_SIZE
|
|
|
|
*k->contexts[cn]->identities[in]->slot;
|
2012-04-12 13:45:21 +00:00
|
|
|
if (!file_offset) {
|
|
|
|
fprintf(stderr,"ID %d:%d has slot=0\n",
|
|
|
|
cn,in);
|
|
|
|
}
|
|
|
|
else if (fseeko(k->file,file_offset,SEEK_SET))
|
2012-04-12 03:23:37 +00:00
|
|
|
errorCount++;
|
|
|
|
else
|
|
|
|
if (fwrite(pkr,KEYRING_PAGE_SIZE,1,k->file)!=1)
|
|
|
|
errorCount++;
|
|
|
|
}
|
2012-04-12 04:30:51 +00:00
|
|
|
}
|
2012-04-12 03:02:01 +00:00
|
|
|
}
|
|
|
|
|
2012-04-12 03:23:37 +00:00
|
|
|
if (errorCount) WHY("One or more errors occurred while commiting keyring to disk");
|
2012-04-12 03:02:01 +00:00
|
|
|
return errorCount;
|
|
|
|
}
|
2012-04-12 07:48:28 +00:00
|
|
|
|
|
|
|
int keyring_set_did(keyring_identity *id,char *did)
|
|
|
|
{
|
|
|
|
if (!id) return WHY("id is null");
|
|
|
|
if (!did) return WHY("did is null");
|
|
|
|
|
|
|
|
/* Find where to put it */
|
|
|
|
int i;
|
|
|
|
for(i=0;i<id->keypair_count;i++)
|
|
|
|
if (id->keypairs[i]->type==KEYTYPE_DID)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (i>=PKR_MAX_KEYPAIRS) return WHY("Too many key pairs");
|
|
|
|
|
|
|
|
/* allocate if needed */
|
|
|
|
if (i>=id->keypair_count) {
|
2012-04-12 13:45:21 +00:00
|
|
|
id->keypairs[i]=calloc(sizeof(keypair),1);
|
|
|
|
if (!id->keypairs[i]) return WHY("calloc() failed");
|
|
|
|
id->keypairs[i]->type=KEYTYPE_DID;
|
2012-04-12 07:48:28 +00:00
|
|
|
unsigned char *packedDid=calloc(32,1);
|
|
|
|
if (!packedDid) return WHY("calloc() failed");
|
|
|
|
id->keypairs[i]->private_key=packedDid;
|
|
|
|
id->keypairs[i]->private_key_len=32;
|
|
|
|
id->keypair_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Store DID unpacked for ease of searching */
|
|
|
|
int len=strlen(did); if (len>31) len=31;
|
2012-04-12 13:45:21 +00:00
|
|
|
bcopy(did,&id->keypairs[i]->private_key[0],len);
|
2012-04-12 07:48:28 +00:00
|
|
|
bzero(&id->keypairs[i]->private_key[len],32-len);
|
2012-04-12 13:45:21 +00:00
|
|
|
dump("storing did",&id->keypairs[i]->private_key[0],32);
|
2012-04-12 07:48:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int keyring_find_did(keyring_file *k,int *cn,int *in,int *kp,char *did)
|
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 07:48:28 +00:00
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
while (1) {
|
|
|
|
/* we know we have a sane position, so see if it is interesting */
|
|
|
|
|
|
|
|
if (k->contexts[*cn]->identities[*in]->keypairs[*kp]->type==KEYTYPE_DID)
|
2012-04-12 07:48:28 +00:00
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
/* Compare DIDs */
|
|
|
|
if ((!did[0])||(!strcasecmp(did,(char *)k->contexts[*cn]->identities[*in]
|
|
|
|
->keypairs[*kp]->private_key)))
|
2012-04-12 07:48:28 +00:00
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
/* match */
|
|
|
|
return 1;
|
2012-04-12 07:48:28 +00:00
|
|
|
}
|
|
|
|
}
|
2012-04-13 00:53:59 +00:00
|
|
|
|
|
|
|
(*kp)++;
|
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 13:45:21 +00:00
|
|
|
}
|
2012-04-13 00:53:59 +00:00
|
|
|
|
2012-04-12 13:45:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-12 23:55:03 +00:00
|
|
|
int keyring_next_identity(keyring_file *k,int *cn,int *in,int *kp)
|
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 23:55:03 +00:00
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
while(1) {
|
|
|
|
if (k->contexts[*cn]->identities[*in]->keypairs[*kp]->type==KEYTYPE_CRYPTOBOX)
|
|
|
|
return 1;
|
2012-04-12 23:55:03 +00:00
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
(*kp)++;
|
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 23:55:03 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
int keyring_sanitise_position(keyring_file *k,int *cn,int *in,int *kp)
|
|
|
|
{
|
|
|
|
if (!k) return 1;
|
|
|
|
/* Sanity check passed in position */
|
|
|
|
if ((*cn)>=keyring->context_count) return 1;
|
|
|
|
if ((*in)>=keyring->contexts[*cn]->identity_count)
|
|
|
|
{
|
|
|
|
(*in)=0; (*cn)++;
|
|
|
|
if ((*cn)>=keyring->context_count) return 1;
|
|
|
|
}
|
|
|
|
if ((*kp)>=keyring->contexts[*cn]->identities[*in]->keypair_count)
|
|
|
|
{
|
|
|
|
*kp=0; (*in)++;
|
|
|
|
if ((*in)>=keyring->contexts[*cn]->identity_count)
|
|
|
|
{
|
|
|
|
(*in)=0; (*cn)++;
|
|
|
|
if ((*cn)>=keyring->context_count) return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-04-12 13:45:21 +00:00
|
|
|
int keyring_find_sid(keyring_file *k,int *cn,int *in,int *kp,unsigned char *sid)
|
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 13:45:21 +00:00
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
while (1) {
|
|
|
|
/* we know we have a sane position, so see if it is interesting */
|
2012-04-12 13:45:21 +00:00
|
|
|
|
2012-04-13 00:53:59 +00:00
|
|
|
if (k->contexts[*cn]->identities[*in]->keypairs[*kp]->type==KEYTYPE_CRYPTOBOX)
|
2012-04-12 13:45:21 +00:00
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
/* Compare SIDs */
|
|
|
|
if (!bcmp(sid,(char *)k->contexts[*cn]->identities[*in]
|
|
|
|
->keypairs[*kp]->public_key,SID_SIZE))
|
2012-04-12 13:45:21 +00:00
|
|
|
{
|
2012-04-13 00:53:59 +00:00
|
|
|
/* match */
|
|
|
|
return 1;
|
2012-04-12 13:45:21 +00:00
|
|
|
}
|
|
|
|
}
|
2012-04-13 00:53:59 +00:00
|
|
|
(*kp)++;
|
|
|
|
if (keyring_sanitise_position(k,cn,in,kp)) return 0;
|
2012-04-12 07:48:28 +00:00
|
|
|
}
|
2012-04-13 00:53:59 +00:00
|
|
|
|
2012-04-12 13:45:21 +00:00
|
|
|
return 0;
|
2012-04-12 07:48:28 +00:00
|
|
|
}
|
2012-04-12 13:45:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
int keyring_enter_pins(keyring_file *k,char *pinlist)
|
|
|
|
{
|
|
|
|
char pin[1024];
|
|
|
|
int i,j=0;
|
|
|
|
|
|
|
|
for(i=0;i<=strlen(pinlist);i++)
|
|
|
|
if (pinlist[i]==','||pinlist[i]==0)
|
|
|
|
{
|
|
|
|
pin[j]=0;
|
|
|
|
keyring_enter_pin(k,pin);
|
|
|
|
j=0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
if (j<1023) pin[j++]=pinlist[i];
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
keyring_file *keyring_open_with_pins(char *pinlist)
|
|
|
|
{
|
|
|
|
keyring_file *k=NULL;
|
|
|
|
|
|
|
|
if (create_serval_instance_dir() == -1)
|
|
|
|
return NULL;
|
|
|
|
char *instancePath = serval_instancepath();
|
|
|
|
char keyringFile[1024];
|
|
|
|
snprintf(keyringFile,1024,"%s/serval.keyring",instancePath);
|
|
|
|
if ((k=keyring_open(keyringFile))==NULL)
|
|
|
|
{ fprintf(stderr,"keyring list:Failed to create/open keyring file\n");
|
|
|
|
return NULL; }
|
|
|
|
|
|
|
|
keyring_enter_pins(k,pinlist);
|
|
|
|
return k;
|
|
|
|
}
|
|
|
|
|
2012-04-12 23:55:03 +00:00
|
|
|
/* If no identities, create an initial identity with a phone number.
|
|
|
|
This identity will not be pin protected (initially). */
|
|
|
|
int keyring_seed(keyring_file *k)
|
|
|
|
{
|
|
|
|
if (!k) return WHY("keyring is null");
|
|
|
|
|
|
|
|
/* nothing to do if there is already an identity */
|
2012-04-13 00:05:22 +00:00
|
|
|
if (k->contexts[0]->identity_count)
|
|
|
|
return 0;
|
2012-04-12 23:55:03 +00:00
|
|
|
|
|
|
|
int i;
|
2012-04-13 00:05:22 +00:00
|
|
|
unsigned char did[65];
|
2012-04-12 23:55:03 +00:00
|
|
|
/* Securely generate random telephone number */
|
|
|
|
urandombytes((unsigned char *)did,10);
|
|
|
|
/* Make DID start with 2 through 9, as 1 is special in many number spaces. */
|
2012-04-13 00:05:22 +00:00
|
|
|
did[0]='2'+(did[0]%8);
|
2012-04-12 23:55:03 +00:00
|
|
|
/* Then add 10 more digits, which is what we do in the mobile phone software */
|
2012-04-13 00:05:22 +00:00
|
|
|
for(i=1;i<11;i++) did[i]='0'+(did[i]%10); did[11]=0;
|
2012-04-12 23:55:03 +00:00
|
|
|
|
|
|
|
keyring_identity *id=keyring_create_identity(k,k->contexts[0],"");
|
|
|
|
if (!id) return WHY("Could not create new identity");
|
2012-04-13 00:05:22 +00:00
|
|
|
if (keyring_set_did(id,(char *)did)) return WHY("Could not set DID of new identity");
|
2012-04-12 23:55:03 +00:00
|
|
|
if (keyring_commit(k)) return WHY("Could not commit new identity to keyring file");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|