ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-20 05:37:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store keyring identity pointer for local identities in subscriber tree

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-10-10 10:32:25 +10:30
parent 2a8cfb0404
commit 4b2b8f1783
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
keyring.c
View File

@ -226,6 +226,11 @@ void keyring_free_identity(keyring_identity *id)
if (id->keypairs[i]) if (id->keypairs[i])
keyring_free_keypair(id->keypairs[i]); keyring_free_keypair(id->keypairs[i]);
if (id->subscriber){
id->subscriber->identity=NULL;
set_reachable(id->subscriber, REACHABLE_NONE);
}
bzero(id,sizeof(keyring_identity)); bzero(id,sizeof(keyring_identity));
return; return;
} }
@ -694,12 +699,15 @@ int keyring_decrypt_pkr(keyring_file *k,keyring_context *c,
int i=0; int i=0;
for (i=0;i<id->keypair_count;i++){ for (i=0;i<id->keypair_count;i++){
if (id->keypairs[i]->type == KEYTYPE_CRYPTOBOX){ if (id->keypairs[i]->type == KEYTYPE_CRYPTOBOX){
struct subscriber *subscriber = find_subscriber(id->keypairs[i]->public_key, SID_SIZE, 1); id->subscriber = find_subscriber(id->keypairs[i]->public_key, SID_SIZE, 1);
if (subscriber){ if (id->subscriber){
set_reachable(subscriber, REACHABLE_SELF); set_reachable(id->subscriber, REACHABLE_SELF);
id->subscriber->identity = id;
if (!my_subscriber) if (!my_subscriber)
my_subscriber=subscriber; my_subscriber=id->subscriber;
} }
// only one key per identity supported
break;
} }
} }
@ -770,6 +778,7 @@ int keyring_enter_pin(keyring_file *k, const char *pin)
with the specified PKR pin. with the specified PKR pin.
The crypto_box and crypto_sign key pairs are automatically created, and the PKR 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. is packed and written to a hithero unallocated slot which is then marked full.
Requires an explicit call to keyring_commit()
*/ */
keyring_identity *keyring_create_identity(keyring_file *k,keyring_context *c, const char *pin) keyring_identity *keyring_create_identity(keyring_file *k,keyring_context *c, const char *pin)
{ {
@ -840,14 +849,6 @@ keyring_identity *keyring_create_identity(keyring_file *k,keyring_context *c, co
crypto_box_curve25519xsalsa20poly1305_keypair(id->keypairs[0]->public_key, crypto_box_curve25519xsalsa20poly1305_keypair(id->keypairs[0]->public_key,
id->keypairs[0]->private_key); id->keypairs[0]->private_key);
// add new identity to in memory table
struct subscriber *subscriber = find_subscriber(id->keypairs[0]->public_key, SID_SIZE, 1);
if (subscriber){
set_reachable(subscriber, REACHABLE_SELF);
if (!my_subscriber)
my_subscriber=subscriber;
}
/* crypto_sign key pair */ /* crypto_sign key pair */
id->keypairs[1]=calloc(sizeof(keypair),1); id->keypairs[1]=calloc(sizeof(keypair),1);
if (!id->keypairs[1]) { if (!id->keypairs[1]) {
@ -899,21 +900,15 @@ keyring_identity *keyring_create_identity(keyring_file *k,keyring_context *c, co
/* Add identity to data structure */ /* Add identity to data structure */
c->identities[c->identity_count++]=id; c->identities[c->identity_count++]=id;
/* We require explicit calling of keyring_commit(), since that seems // add new identity to in memory table
more sensible */ id->subscriber = find_subscriber(id->keypairs[0]->public_key, SID_SIZE, 1);
#ifdef NOTDEFINED if (id->subscriber){
/* Commit keyring to disk */ set_reachable(id->subscriber, REACHABLE_SELF);
if (keyring_commit(k)) id->subscriber->identity = id;
{ if (!my_subscriber)
/* Write to disk failed, so unlink identity and clear allocation and generally my_subscriber=id->subscriber;
clean up the mess. */ }
b->bitmap[byte]&=0xff-(1<<bit);
/* Add identity to data structure */
c->identities[--c->identity_count]=NULL;
}
else
#endif
/* Everything went fine */ /* Everything went fine */
return id; return id;

2
overlay_address.h
View File

@ -99,6 +99,8 @@ struct subscriber{
time_ms_t sas_last_request; time_ms_t sas_last_request;
unsigned char sas_valid; unsigned char sas_valid;
// private keys for local identities
keyring_identity *identity;
}; };
struct broadcast{ struct broadcast{

1
serval.h
View File

@ -208,6 +208,7 @@ typedef struct keypair {
#define PKR_MAC_BYTES 64 #define PKR_MAC_BYTES 64
typedef struct keyring_identity { typedef struct keyring_identity {
char *PKRPin; char *PKRPin;
struct subscriber *subscriber;
unsigned int slot; unsigned int slot;
int keypair_count; int keypair_count;
keypair *keypairs[PKR_MAX_KEYPAIRS]; keypair *keypairs[PKR_MAX_KEYPAIRS];