scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-18 04:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix segfault bug if given vault is NULL

Browse Source
This commit is contained in:
Thomas von Dein
2016-10-25 16:32:05 +02:00
parent 7672be2a8d
commit 0b1e843ee8
1 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/keyprint.c
View File

@@ -109,64 +109,66 @@ void pcptext_key(char *keyid) {
} }
void pcptext_vault(vault_t *vault) { void pcptext_vault(vault_t *vault) {
if(vault != NULL) {
#ifdef HAVE_JSON #ifdef HAVE_JSON
if(ptx->json) { if(ptx->json) {
json_t *jout, *jkeys, *jtmp; json_t *jout, *jkeys, *jtmp;
char *checksum, *jdump; char *checksum, *jdump;
pcp_key_t *k; pcp_key_t *k;
pcp_pubkey_t *p; pcp_pubkey_t *p;
checksum = _bin2hex(vault->checksum, LSHA); checksum = _bin2hex(vault->checksum, LSHA);
jout = json_pack("{sssisssisi}", jout = json_pack("{sssisssisi}",
"keyvaultfile" , vault->filename, "keyvaultfile" , vault->filename,
"version" , vault->version, "version" , vault->version,
"checksum" , checksum, "checksum" , checksum,
"secretkeys" , pcphash_count(ptx), "secretkeys" , pcphash_count(ptx),
"publickey" , pcphash_countpub(ptx)); "publickey" , pcphash_countpub(ptx));
jkeys = json_array(); jkeys = json_array();
pcphash_iterate(ptx, k) { pcphash_iterate(ptx, k) {
jtmp = pcp_sk2json(k, NULL, 0); jtmp = pcp_sk2json(k, NULL, 0);
json_object_set(jtmp, "type", json_string("secret")); json_object_set(jtmp, "type", json_string("secret"));
json_array_append(jkeys, jtmp); json_array_append(jkeys, jtmp);
}
pcphash_iteratepub(ptx, p) {
jtmp = pcp_pk2json(p);
json_array_append(jkeys, jtmp);
}
json_object_set(jout, "keys", jkeys);
jdump = json_dumps(jout, JSON_INDENT(4) | JSON_PRESERVE_ORDER);
printf("%s\n", jdump);
json_decref(jout);
free(jdump);
} }
else {
pcphash_iteratepub(ptx, p) {
jtmp = pcp_pk2json(p);
json_array_append(jkeys, jtmp);
}
json_object_set(jout, "keys", jkeys);
jdump = json_dumps(jout, JSON_INDENT(4) | JSON_PRESERVE_ORDER);
printf("%s\n", jdump);
json_decref(jout);
free(jdump);
}
else {
#endif #endif
printf(" Key vault: %s\n", vault->filename); printf(" Key vault: %s\n", vault->filename);
printf("Vault version: %08X\n", vault->version); printf("Vault version: %08X\n", vault->version);
printf(" Checksum: "); printf(" Checksum: ");
int i; int i;
for ( i = 0;i <15 ;++i) printf("%02X:",(unsigned int) vault->checksum[i]); for ( i = 0;i <15 ;++i) printf("%02X:",(unsigned int) vault->checksum[i]);
printf("%02X", vault->checksum[15]); printf("%02X", vault->checksum[15]);
printf("\n "); printf("\n ");
for ( i = 16;i <31 ;++i) printf("%02X:",(unsigned int) vault->checksum[i]); for ( i = 16;i <31 ;++i) printf("%02X:",(unsigned int) vault->checksum[i]);
printf("%02X", vault->checksum[31]); printf("%02X", vault->checksum[31]);
printf("\n"); printf("\n");
printf(" Secret keys: %d\n", pcphash_count(ptx)); printf(" Secret keys: %d\n", pcphash_count(ptx));
printf(" Public keys: %d\n", pcphash_countpub(ptx) ); printf(" Public keys: %d\n", pcphash_countpub(ptx) );
#ifdef HAVE_JSON #ifdef HAVE_JSON
} }
#endif #endif
}
} }
void pcpkey_printlineinfo(pcp_key_t *key) { void pcpkey_printlineinfo(pcp_key_t *key) {