2013-11-04 17:43:22 +01:00
|
|
|
/*
|
|
|
|
|
This file is part of Pretty Curved Privacy (pcp1).
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2013 T.Linden.
|
|
|
|
|
|
|
|
|
|
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 3 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
You can contact me by mail: <tlinden AT cpan DOT org>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
#include "keymgmt.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
char *pcp_getstdin(const char *prompt) {
|
2013-11-02 11:02:36 +01:00
|
|
|
char line[255];
|
2013-10-28 22:50:05 +01:00
|
|
|
char *out;
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "%s: ", prompt);
|
|
|
|
|
|
2013-11-02 11:02:36 +01:00
|
|
|
if (fgets(line, 255, stdin) == NULL) {
|
2013-10-28 22:50:05 +01:00
|
|
|
fatal("Cannot read from stdin");
|
|
|
|
|
goto errgst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
line[strcspn(line, "\r\n")] = '\0';
|
|
|
|
|
|
|
|
|
|
if ((out = strdup(line)) == NULL) {
|
|
|
|
|
fatal("Cannot allocate memory");
|
|
|
|
|
goto errgst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return out;
|
|
|
|
|
|
|
|
|
|
errgst:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int pcp_storekey (pcp_key_t *key) {
|
|
|
|
|
if(vault->isnew == 1 || HASH_COUNT(pcpkey_hash) == 0) {
|
|
|
|
|
key->type = PCP_KEY_TYPE_MAINSECRET;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-18 17:38:03 +01:00
|
|
|
if(pcpvault_addkey(vault, key, key->type) == 0) {
|
2013-10-28 22:50:05 +01:00
|
|
|
if(vault->isnew)
|
|
|
|
|
fprintf(stderr, "new vault created, ");
|
|
|
|
|
fprintf(stderr, "key 0x%s added to %s.\n", key->id, vault->filename);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
2013-11-12 16:58:59 +01:00
|
|
|
void pcp_keygen(char *passwd, char *outfile) {
|
2013-10-28 22:50:05 +01:00
|
|
|
pcp_key_t *k = pcpkey_new ();
|
2013-11-12 16:58:59 +01:00
|
|
|
pcp_key_t *key = NULL;
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
char *owner = pcp_getstdin("Enter the name of the key owner");
|
|
|
|
|
memcpy(k->owner, owner, strlen(owner) + 1);
|
|
|
|
|
|
|
|
|
|
char *mail = pcp_getstdin("Enter the email address of the key owner");
|
2013-11-03 14:50:03 +01:00
|
|
|
memcpy(k->mail, _lc(mail), strlen(mail) + 1);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
if(debug)
|
|
|
|
|
pcp_dumpkey(k);
|
|
|
|
|
|
|
|
|
|
char *passphrase;
|
|
|
|
|
if(passwd == NULL) {
|
|
|
|
|
pcp_readpass(&passphrase,
|
|
|
|
|
"Enter passphrase for key encryption",
|
|
|
|
|
"Enter the passphrase again", 1);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
passphrase = ucmalloc(strlen(passwd)+1);
|
|
|
|
|
strncpy(passphrase, passwd, strlen(passwd)+1);
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-12 10:26:47 +01:00
|
|
|
if(strnlen(passphrase, 1024) > 0)
|
|
|
|
|
key = pcpkey_encrypt(k, passphrase);
|
2013-11-12 10:37:32 +01:00
|
|
|
else {
|
|
|
|
|
char *yes = pcp_getstdin("WARNING: secret key will be stored unencrypted. Are you sure [yes|NO]?");
|
|
|
|
|
if(strncmp(yes, "yes", 1024) == 0)
|
|
|
|
|
key = k;
|
|
|
|
|
else {
|
|
|
|
|
memset(key, 0, sizeof(pcp_key_t));
|
|
|
|
|
free(key);
|
|
|
|
|
goto errkg1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
if(key != NULL) {
|
2013-11-12 16:58:59 +01:00
|
|
|
fprintf(stderr, "Generated new secret key:\n");
|
|
|
|
|
if(outfile != NULL) {
|
|
|
|
|
pcp_exportsecretkey(key, outfile);
|
2013-10-28 22:50:05 +01:00
|
|
|
pcpkey_printshortinfo(key);
|
2013-11-12 16:58:59 +01:00
|
|
|
fprintf(stderr, "key stored to file %s, vault unaltered\n", outfile);
|
|
|
|
|
memset(key, 0, sizeof(pcp_key_t));
|
|
|
|
|
free(key);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(pcp_storekey(key) == 0) {
|
|
|
|
|
pcpkey_printshortinfo(key);
|
2013-11-18 21:48:24 +01:00
|
|
|
memset(key, 0, sizeof(pcp_key_t));
|
|
|
|
|
free(key);
|
2013-11-12 16:58:59 +01:00
|
|
|
}
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
2013-11-12 10:37:32 +01:00
|
|
|
|
|
|
|
|
errkg1:
|
2013-10-28 22:50:05 +01:00
|
|
|
free(mail);
|
|
|
|
|
free(owner);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void pcp_listkeys() {
|
|
|
|
|
pcp_key_t *k;
|
|
|
|
|
|
|
|
|
|
int nkeys = HASH_COUNT(pcpkey_hash) + HASH_COUNT(pcppubkey_hash);
|
|
|
|
|
|
|
|
|
|
if(nkeys > 0) {
|
|
|
|
|
printf("Key ID Type Creation Time Owner\n");
|
|
|
|
|
|
2013-11-13 13:06:01 +01:00
|
|
|
pcphash_iterate(k) {
|
2013-10-28 22:50:05 +01:00
|
|
|
pcpkey_printlineinfo(k);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pcp_pubkey_t *p;
|
2013-11-13 13:06:01 +01:00
|
|
|
pcphash_iteratepub(p) {
|
2013-10-28 22:50:05 +01:00
|
|
|
pcppubkey_printlineinfo(p);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fatal("The key vault file %s doesn't contain any keys so far.\n", vault->filename);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
char *pcp_normalize_id(char *keyid) {
|
|
|
|
|
char *id = ucmalloc(17);
|
|
|
|
|
int len = strnlen(keyid, 24);
|
|
|
|
|
|
|
|
|
|
if(len == 16) {
|
|
|
|
|
memcpy(id, keyid, 17);
|
|
|
|
|
}
|
|
|
|
|
else if(len < 16) {
|
|
|
|
|
fatal("Specified key id %s is too short!\n", keyid);
|
|
|
|
|
free(id);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else if(len > 18) {
|
|
|
|
|
fatal("Specified key id %s is too long!\n", keyid);
|
|
|
|
|
free(id);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(keyid[0] == '0' && keyid[1] == 'x' && len == 18) {
|
|
|
|
|
int i;
|
|
|
|
|
for(i=0; i<16; ++i) {
|
|
|
|
|
id[i] = keyid[i+2];
|
|
|
|
|
}
|
|
|
|
|
id[16] = 0;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fatal("Specified key id %s is too long!\n", keyid);
|
|
|
|
|
free(id);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pcp_key_t *pcp_find_primary_secret() {
|
|
|
|
|
pcp_key_t *key = NULL;
|
|
|
|
|
pcp_key_t *k;
|
2013-11-13 13:06:01 +01:00
|
|
|
pcphash_iterate(k) {
|
2013-10-28 22:50:05 +01:00
|
|
|
if(k->type == PCP_KEY_TYPE_MAINSECRET) {
|
|
|
|
|
key = ucmalloc(sizeof(pcp_key_t));
|
|
|
|
|
memcpy(key, k, sizeof(pcp_key_t));
|
|
|
|
|
return key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* no primary? whoops */
|
2013-10-28 22:50:05 +01:00
|
|
|
int nkeys = HASH_COUNT(pcpkey_hash);
|
|
|
|
|
if(nkeys == 1) {
|
2013-11-13 13:06:01 +01:00
|
|
|
pcphash_iterate(k) {
|
2013-10-28 22:50:05 +01:00
|
|
|
key = ucmalloc(sizeof(pcp_key_t));
|
|
|
|
|
memcpy(key, k, sizeof(pcp_key_t));
|
|
|
|
|
return key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void pcp_exportsecret(char *keyid, int useid, char *outfile) {
|
|
|
|
|
pcp_key_t *key = NULL;
|
|
|
|
|
|
|
|
|
|
if(useid == 1) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* look if we've got that one */
|
2013-10-28 22:50:05 +01:00
|
|
|
HASH_FIND_STR(pcpkey_hash, keyid, key);
|
|
|
|
|
if(key == NULL) {
|
|
|
|
|
fatal("Could not find a secret key with id 0x%s in vault %s!\n", keyid, vault->filename);
|
|
|
|
|
free(key);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* look for our primary key */
|
2013-10-28 22:50:05 +01:00
|
|
|
key = pcp_find_primary_secret();
|
|
|
|
|
if(key == NULL) {
|
|
|
|
|
fatal("There's no primary secret key in the vault %s!\n", vault->filename);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(key != NULL) {
|
2013-11-12 16:58:59 +01:00
|
|
|
pcp_exportsecretkey(key, outfile);
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-10-28 22:50:05 +01:00
|
|
|
|
2013-11-12 16:58:59 +01:00
|
|
|
void pcp_exportsecretkey(pcp_key_t *key, char *outfile) {
|
|
|
|
|
FILE *out;
|
|
|
|
|
if(outfile == NULL) {
|
|
|
|
|
out = stdout;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if((out = fopen(outfile, "wb+")) == NULL) {
|
|
|
|
|
fatal("Could not create output file %s", outfile);
|
|
|
|
|
out = NULL;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
2013-11-12 16:58:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(out != NULL) {
|
|
|
|
|
if(debug)
|
|
|
|
|
pcp_dumpkey(key);
|
|
|
|
|
else
|
|
|
|
|
pcpkey_print(key, out);
|
2014-02-05 20:41:16 +01:00
|
|
|
/* scip */
|
|
|
|
|
/* printf("EXPORT:\n"); */
|
|
|
|
|
/* pcpprint_bin(stdout, key, PCP_RAW_KEYSIZE); printf("\n"); */
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-02 11:02:36 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
if id given, look if it is already a public and export this,
|
|
|
|
|
else we look for a secret key with that id. without a given
|
2014-01-19 23:57:11 +01:00
|
|
|
keyid we use the primary key. if no keyid has been given but
|
|
|
|
|
a recipient instead, we try to look up the vault for a match.
|
2013-11-02 11:02:36 +01:00
|
|
|
*/
|
2014-01-28 16:53:26 +01:00
|
|
|
void pcp_exportpublic(char *keyid, char *recipient, char *passwd, char *outfile, int pbpcompat) {
|
2013-11-02 11:02:36 +01:00
|
|
|
pcp_pubkey_t *key = NULL;
|
|
|
|
|
|
|
|
|
|
if(keyid != NULL) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* look if we've got that one */
|
2013-10-28 22:50:05 +01:00
|
|
|
HASH_FIND_STR(pcppubkey_hash, keyid, key);
|
|
|
|
|
if(key == NULL) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* maybe it's a secret key? */
|
2013-10-28 22:50:05 +01:00
|
|
|
pcp_key_t *s = NULL;
|
|
|
|
|
HASH_FIND_STR(pcpkey_hash, keyid, s);
|
|
|
|
|
if(s == NULL) {
|
|
|
|
|
fatal("Could not find a public key with id 0x%s in vault %s!\n", keyid, vault->filename);
|
|
|
|
|
free(s);
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-01-19 23:57:11 +01:00
|
|
|
key = pcpkey_pub_from_secret(s);
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* look for the primary secret */
|
2013-10-28 22:50:05 +01:00
|
|
|
pcp_key_t *s = NULL;
|
|
|
|
|
s = pcp_find_primary_secret();
|
|
|
|
|
if(s == NULL) {
|
|
|
|
|
fatal("There's no primary secret key in the vault %s!\n", vault->filename);
|
|
|
|
|
free(s);
|
|
|
|
|
}
|
|
|
|
|
else {
|
2014-01-19 23:57:11 +01:00
|
|
|
key = pcpkey_pub_from_secret(s);
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(key != NULL) {
|
|
|
|
|
FILE *out;
|
|
|
|
|
if(outfile == NULL) {
|
|
|
|
|
out = stdout;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if((out = fopen(outfile, "wb+")) == NULL) {
|
|
|
|
|
fatal("Could not create output file %s", outfile);
|
|
|
|
|
out = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(out != NULL) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* scip */
|
|
|
|
|
/* printf("EXPORT:\n"); */
|
|
|
|
|
/* pcpprint_bin(stdout, key, PCP_RAW_PUBKEYSIZE); printf("\n"); */
|
2014-01-28 16:53:26 +01:00
|
|
|
pcppubkey_print(key, out, pbpcompat);
|
|
|
|
|
if(pbpcompat)
|
|
|
|
|
fprintf(stderr, "public key exported in PBP format.\n");
|
|
|
|
|
else
|
|
|
|
|
fprintf(stderr, "public key exported.\n");
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free(key);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int pcp_importsecret (vault_t *vault, FILE *in) {
|
|
|
|
|
size_t clen;
|
|
|
|
|
char *z85 = pcp_readz85file(in);
|
|
|
|
|
|
|
|
|
|
if(z85 == NULL)
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
unsigned char *z85decoded = pcp_z85_decode((char *)z85, &clen);
|
|
|
|
|
free(z85);
|
|
|
|
|
|
|
|
|
|
if(z85decoded == NULL) {
|
|
|
|
|
fatal("Error: could not decode input - it's probably not Z85.\n");
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
2013-11-18 17:38:03 +01:00
|
|
|
if(clen != PCP_RAW_KEYSIZE) {
|
2013-10-28 22:50:05 +01:00
|
|
|
fatal("Error: decoded input didn't result to a proper sized key! (got %d bytes)\n", clen);
|
|
|
|
|
free(z85decoded);
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* all good now, import the blob */
|
2013-11-18 17:38:03 +01:00
|
|
|
pcp_key_t *key = ucmalloc(sizeof(pcp_key_t));
|
|
|
|
|
memcpy(key, z85decoded, PCP_RAW_KEYSIZE);
|
2013-11-04 14:03:43 +01:00
|
|
|
key2native(key);
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
if(debug)
|
|
|
|
|
pcp_dumpkey(key);
|
|
|
|
|
|
|
|
|
|
if(pcp_sanitycheck_key(key) == 0) {
|
|
|
|
|
if(key->secret[0] != 0) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* unencrypted, encrypt it */
|
2013-10-28 22:50:05 +01:00
|
|
|
fprintf(stderr, "Key to be imported is unencrypted.\n");
|
|
|
|
|
char *passphrase;
|
|
|
|
|
pcp_readpass(&passphrase, "Enter passphrase for key encryption", NULL, 1);
|
|
|
|
|
key = pcpkey_encrypt(key, passphrase);
|
|
|
|
|
}
|
|
|
|
|
int nkeys = HASH_COUNT(pcpkey_hash);
|
|
|
|
|
if(nkeys == 0)
|
|
|
|
|
key->type = PCP_KEY_TYPE_MAINSECRET;
|
|
|
|
|
|
2013-11-18 17:38:03 +01:00
|
|
|
if(pcpvault_addkey(vault, (void *)key, PCP_KEY_TYPE_SECRET) == 0) {
|
2013-10-28 22:50:05 +01:00
|
|
|
fprintf(stderr, "key 0x%s added to %s.\n", key->id, vault->filename);
|
2013-11-18 21:48:24 +01:00
|
|
|
free(key);
|
2013-10-28 22:50:05 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-18 21:48:24 +01:00
|
|
|
free(key);
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-01-28 16:53:26 +01:00
|
|
|
int pcp_importpublic (vault_t *vault, FILE *in, int pbpcompat) {
|
|
|
|
|
pcp_pubkey_t *pub = NULL;
|
|
|
|
|
if(pbpcompat == 1) {
|
2014-02-06 16:30:50 +01:00
|
|
|
char *date = NULL;
|
2014-01-29 12:53:42 +01:00
|
|
|
char *parts = NULL;
|
|
|
|
|
int pnum;
|
|
|
|
|
pbp_pubkey_t *b = ucmalloc(sizeof(pbp_pubkey_t));
|
2014-02-06 16:30:50 +01:00
|
|
|
pcp_pubkey_t *tmp = ucmalloc(sizeof(pcp_pubkey_t));
|
2014-01-28 16:53:26 +01:00
|
|
|
pub = ucmalloc(sizeof(pcp_pubkey_t));
|
2014-01-30 13:16:26 +01:00
|
|
|
unsigned char *buf = ucmalloc(2048);
|
|
|
|
|
unsigned char *bin = ucmalloc(2048);
|
|
|
|
|
size_t buflen;
|
|
|
|
|
size_t klen;
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
buflen = fread(buf, 1, 2048, in); /* base85 encoded */
|
2014-01-30 13:16:26 +01:00
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* remove trailing newline, if any */
|
2014-01-30 14:33:59 +01:00
|
|
|
size_t i, nlen;
|
|
|
|
|
nlen = buflen;
|
|
|
|
|
for(i=buflen; i>0; --i) {
|
|
|
|
|
if(buf[i] == '\n' || buf[i] == '\r') {
|
|
|
|
|
buf[i] = '\0';
|
|
|
|
|
nlen -= 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-02-06 16:30:50 +01:00
|
|
|
|
|
|
|
|
klen = nlen /5 * 4; /*((nlen + (5 - (nlen % 5))) / 5) * 4;*/
|
2014-01-30 14:33:59 +01:00
|
|
|
|
|
|
|
|
if(decode_85((char *)bin, (char *)buf, klen) != 0)
|
2014-01-30 13:16:26 +01:00
|
|
|
goto errimp1;
|
|
|
|
|
|
|
|
|
|
if(klen < sizeof(pbp_pubkey_t) - 1024 - crypto_sign_BYTES) {
|
|
|
|
|
fatal("PBP key seems to be too small, maybe it's not a PBP key (got %ld, expected %ld)\n",
|
|
|
|
|
klen, sizeof(pbp_pubkey_t) - 1024);
|
2014-01-29 12:53:42 +01:00
|
|
|
goto errimp1;
|
|
|
|
|
}
|
2014-01-28 16:53:26 +01:00
|
|
|
|
2014-02-06 16:30:50 +01:00
|
|
|
if(debug)
|
|
|
|
|
_dump("sig", bin, nlen);
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* unpad result, if any */
|
2014-02-03 12:19:17 +01:00
|
|
|
for(i=klen; i>0; --i) {
|
|
|
|
|
if(bin[i] != '\0' && i < klen) {
|
|
|
|
|
klen = i + 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* use first part as sig and verify */
|
2014-01-30 13:16:26 +01:00
|
|
|
memcpy(b, &bin[crypto_sign_BYTES], klen - crypto_sign_BYTES);
|
|
|
|
|
|
2014-02-06 16:30:50 +01:00
|
|
|
if(debug)
|
|
|
|
|
_dump("sig", bin, klen);
|
|
|
|
|
|
|
|
|
|
/* parse the date */
|
|
|
|
|
date = ucmalloc(19);
|
|
|
|
|
memcpy(date, b->iso_ctime, 18);
|
|
|
|
|
date[19] = '\0';
|
|
|
|
|
struct tm c;
|
|
|
|
|
if(strptime(date, "%Y-%m-%dT%H:%M:%S", &c) == NULL) {
|
|
|
|
|
fatal("Failed to parse creation time in PBP public key file (<%s>)\n", date);
|
|
|
|
|
goto errimp2;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* parse the name */
|
2014-01-29 12:53:42 +01:00
|
|
|
parts = strtok (b->name, "<>");
|
|
|
|
|
pnum = 0;
|
2014-01-28 16:53:26 +01:00
|
|
|
while (parts != NULL) {
|
|
|
|
|
if(pnum == 0)
|
|
|
|
|
memcpy(pub->owner, parts, strlen(parts));
|
|
|
|
|
else if (pnum == 1)
|
|
|
|
|
memcpy(pub->mail, parts, strlen(parts));
|
2014-01-28 20:05:46 +01:00
|
|
|
parts = strtok(NULL, "<>");
|
2014-01-28 16:53:26 +01:00
|
|
|
pnum++;
|
|
|
|
|
}
|
|
|
|
|
free(parts);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
2014-01-30 14:33:59 +01:00
|
|
|
if(strlen(b->name) == 0) {
|
|
|
|
|
char *owner = pcp_getstdin("Enter the name of the key owner");
|
2014-02-06 16:30:50 +01:00
|
|
|
memcpy(pub->owner, owner, strlen(owner) + 1);
|
2014-01-30 14:33:59 +01:00
|
|
|
free(owner);
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* fill in the fields */
|
2014-02-06 16:30:50 +01:00
|
|
|
pub->ctime = (long)mktime(&c);
|
2014-01-28 16:53:26 +01:00
|
|
|
pub->type = PCP_KEY_TYPE_PUBLIC;
|
|
|
|
|
pub->version = PCP_KEY_VERSION;
|
|
|
|
|
pub->serial = arc4random();
|
2014-01-29 12:53:42 +01:00
|
|
|
memcpy(pub->pub, b->pub, crypto_box_PUBLICKEYBYTES);
|
|
|
|
|
memcpy(pub->edpub, b->edpub, crypto_sign_PUBLICKEYBYTES);
|
2014-02-06 16:30:50 +01:00
|
|
|
memcpy(pub->id, pcp_getpubkeyid(pub), 17);
|
|
|
|
|
|
|
|
|
|
/* edpub used for signing, might differ */
|
|
|
|
|
memcpy(tmp->edpub, b->sigpub, crypto_sign_PUBLICKEYBYTES);
|
|
|
|
|
|
|
|
|
|
if(debug) {
|
|
|
|
|
_dump(" mp", tmp->edpub, crypto_sign_PUBLICKEYBYTES);
|
|
|
|
|
_dump(" cp", pub->pub, crypto_sign_PUBLICKEYBYTES);
|
|
|
|
|
_dump(" sp", pub->edpub, crypto_sign_PUBLICKEYBYTES);
|
|
|
|
|
_dump("name", (unsigned char *)pub->owner, strlen(pub->owner));
|
|
|
|
|
_dump(" sig", bin, klen);
|
|
|
|
|
fprintf(stderr, "<%s>\n", (unsigned char *)pub->owner);
|
|
|
|
|
pcp_dumppubkey(pub);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned char *sig = pcp_ed_verify(bin, klen, tmp);
|
|
|
|
|
free(tmp);
|
2014-01-28 16:53:26 +01:00
|
|
|
|
2014-02-03 12:19:17 +01:00
|
|
|
if(sig == NULL)
|
|
|
|
|
goto errimp1;
|
|
|
|
|
|
|
|
|
|
free(sig);
|
2014-01-29 12:53:42 +01:00
|
|
|
free(b);
|
2014-01-30 13:16:26 +01:00
|
|
|
free(buf);
|
|
|
|
|
free(bin);
|
2014-01-28 16:53:26 +01:00
|
|
|
goto kimp;
|
|
|
|
|
|
2014-02-06 16:30:50 +01:00
|
|
|
errimp2:
|
|
|
|
|
free(date);
|
2014-01-30 13:16:26 +01:00
|
|
|
|
2014-01-28 16:53:26 +01:00
|
|
|
errimp1:
|
2014-01-30 14:33:59 +01:00
|
|
|
free(bin);
|
2014-01-28 16:53:26 +01:00
|
|
|
free(pub);
|
2014-01-29 12:53:42 +01:00
|
|
|
free(b);
|
2014-01-30 13:16:26 +01:00
|
|
|
free(buf);
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
2014-01-28 16:53:26 +01:00
|
|
|
else {
|
|
|
|
|
size_t clen;
|
|
|
|
|
char *z85 = pcp_readz85file(in);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
2014-01-28 16:53:26 +01:00
|
|
|
if(z85 == NULL)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
unsigned char *z85decoded = pcp_z85_decode((char *)z85, &clen);
|
|
|
|
|
free(z85);
|
|
|
|
|
|
|
|
|
|
if(z85decoded == NULL) {
|
|
|
|
|
fatal("Error: could not decode input - it's probably not Z85 (got %d bytes)\n", clen);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(clen != PCP_RAW_PUBKEYSIZE) {
|
|
|
|
|
fatal("Error: decoded input didn't result to a proper sized key (got %d, expected %d)!\n", clen, PCP_RAW_PUBKEYSIZE);
|
|
|
|
|
free(z85decoded);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
/* all good now */
|
2014-01-28 16:53:26 +01:00
|
|
|
pub = ucmalloc(sizeof(pcp_pubkey_t));
|
|
|
|
|
memcpy(pub, z85decoded, PCP_RAW_PUBKEYSIZE);
|
|
|
|
|
pubkey2native(pub);
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
2014-01-28 16:53:26 +01:00
|
|
|
kimp:
|
2013-11-04 14:03:43 +01:00
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
if(debug)
|
|
|
|
|
pcp_dumppubkey(pub);
|
|
|
|
|
if(pcp_sanitycheck_pub(pub) == 0) {
|
2013-11-18 17:38:03 +01:00
|
|
|
if(pcpvault_addkey(vault, (void *)pub, PCP_KEY_TYPE_PUBLIC) == 0) {
|
2013-10-28 22:50:05 +01:00
|
|
|
fprintf(stderr, "key 0x%s added to %s.\n", pub->id, vault->filename);
|
2013-11-18 21:48:24 +01:00
|
|
|
free(pub);
|
2013-10-28 22:50:05 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-18 21:48:24 +01:00
|
|
|
free(pub);
|
2013-11-09 13:46:40 +01:00
|
|
|
return 1;
|
2013-10-28 22:50:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void pcpdelete_key(char *keyid) {
|
2013-11-13 13:06:01 +01:00
|
|
|
pcp_pubkey_t *p = pcphash_pubkeyexists(keyid);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
if(p != NULL) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* delete public */
|
2013-10-28 22:50:05 +01:00
|
|
|
HASH_DEL(pcppubkey_hash, p);
|
|
|
|
|
free(p);
|
|
|
|
|
vault->unsafed = 1;
|
|
|
|
|
fprintf(stderr, "Public key deleted.\n");
|
|
|
|
|
}
|
|
|
|
|
else {
|
2013-11-13 13:06:01 +01:00
|
|
|
pcp_key_t *s = pcphash_keyexists(keyid);
|
2013-10-28 22:50:05 +01:00
|
|
|
if(s != NULL) {
|
2014-02-05 20:41:16 +01:00
|
|
|
/* delete secret */
|
2013-10-28 22:50:05 +01:00
|
|
|
HASH_DEL(pcpkey_hash, s);
|
|
|
|
|
free(s);
|
|
|
|
|
vault->unsafed = 1;
|
|
|
|
|
fprintf(stderr, "Secret key deleted.\n");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fatal("No key with id 0x%s found!\n", keyid);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void pcpedit_key(char *keyid) {
|
2013-11-13 13:06:01 +01:00
|
|
|
pcp_key_t *key = pcphash_keyexists(keyid);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
if(key != NULL) {
|
|
|
|
|
if(key->secret[0] == 0) {
|
|
|
|
|
char *passphrase;
|
|
|
|
|
pcp_readpass(&passphrase, "Enter passphrase to decrypt the key", NULL, 1);
|
|
|
|
|
key = pcpkey_decrypt(key, passphrase);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(key != NULL) {
|
|
|
|
|
char *owner = pcp_getstdin("Enter the name of the key owner");
|
|
|
|
|
memcpy(key->owner, owner, strlen(owner) + 1);
|
|
|
|
|
|
|
|
|
|
char *mail = pcp_getstdin("Enter the email address of the key owner");
|
|
|
|
|
memcpy(key->mail, mail, strlen(mail) + 1);
|
|
|
|
|
|
|
|
|
|
char *passphrase;
|
|
|
|
|
pcp_readpass(&passphrase, "Enter passphrase for key encryption", NULL, 1);
|
|
|
|
|
key = pcpkey_encrypt(key, passphrase);
|
|
|
|
|
|
|
|
|
|
if(key != NULL) {
|
|
|
|
|
if(debug)
|
|
|
|
|
pcp_dumpkey(key);
|
|
|
|
|
|
2014-02-05 20:41:16 +01:00
|
|
|
vault->unsafed = 1; /* will be safed automatically */
|
2013-10-28 22:50:05 +01:00
|
|
|
fprintf(stderr, "Key key changed.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
fatal("No key with id 0x%s found!\n", keyid);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-11-03 14:39:16 +01:00
|
|
|
char *pcp_find_id_byrec(char *recipient) {
|
|
|
|
|
pcp_pubkey_t *p;
|
|
|
|
|
char *id = NULL;
|
2013-11-03 14:50:03 +01:00
|
|
|
_lc(recipient);
|
2013-11-13 13:06:01 +01:00
|
|
|
pcphash_iteratepub(p) {
|
2013-11-03 14:39:16 +01:00
|
|
|
if(strncmp(p->owner, recipient, 255) == 0) {
|
|
|
|
|
id = ucmalloc(17);
|
|
|
|
|
strncpy(id, p->id, 17);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if(strncmp(p->mail, recipient, 255) == 0) {
|
|
|
|
|
id = ucmalloc(17);
|
|
|
|
|
strncpy(id, p->id, 17);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return id;
|
|
|
|
|
}
|
2013-11-03 14:50:03 +01:00
|
|
|
|