X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=keyindex.c;h=e8d569a45b22de0d04e4ab4a9eae82af3acf1839;hp=c656bd142e9f7f500965c182bdecb3b6c83d3c6b;hb=58ed9a0076feb9604154b99da6ed1907ca7df089;hpb=6df51fef2960f533a741fb7290867387ed3fbba5
diff --git a/keyindex.c b/keyindex.c
index c656bd1..e8d569a 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -80,6 +80,8 @@ char pkalgo2char(uint8_t algo)
unsigned int keylength(struct openpgp_packet *keydata)
{
unsigned int length;
+ uint8_t keyofs;
+ enum onak_oid oid;
switch (keydata->data[0]) {
case 2:
@@ -88,106 +90,33 @@ unsigned int keylength(struct openpgp_packet *keydata)
keydata->data[9];
break;
case 4:
+ case 5:
+ /* v5 has an additional 4 bytes of key length data */
+ keyofs = (keydata->data[0] == 4) ? 6 : 10;
switch (keydata->data[5]) {
case OPENPGP_PKALGO_EC:
case OPENPGP_PKALGO_ECDSA:
case OPENPGP_PKALGO_EDDSA:
/* Elliptic curve key size is based on OID */
- /* Curve25519 / 1.3.6.1.4.1.3029.1.5.1 */
- if ((keydata->data[6] == 10) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x06) &&
- (keydata->data[9] == 0x01) &&
- (keydata->data[10] == 0x04) &&
- (keydata->data[11] == 0x01) &&
- (keydata->data[12] == 0x97) &&
- (keydata->data[13] == 0x55) &&
- (keydata->data[14] == 0x01) &&
- (keydata->data[15] == 0x05) &&
- (keydata->data[16] == 0x01)) {
+ oid = onak_parse_oid(&keydata->data[keyofs],
+ keydata->length - keyofs);
+ if (oid == ONAK_OID_CURVE25519) {
length = 255;
- /* Ed25519 / 1.3.6.1.4.1.11591.15.1 */
- } else if ((keydata->data[6] == 9) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x06) &&
- (keydata->data[9] == 0x01) &&
- (keydata->data[10] == 0x04) &&
- (keydata->data[11] == 0x01) &&
- (keydata->data[12] == 0xDA) &&
- (keydata->data[13] == 0x47) &&
- (keydata->data[14] == 0x0F) &&
- (keydata->data[15] == 0x01)) {
+ } else if (oid == ONAK_OID_ED25519) {
length = 255;
- /* nistp256 / 1.2.840.10045.3.1.7 */
- } else if ((keydata->data[6] == 8) &&
- (keydata->data[7] == 0x2A) &&
- (keydata->data[8] == 0x86) &&
- (keydata->data[9] == 0x48) &&
- (keydata->data[10] == 0xCE) &&
- (keydata->data[11] == 0x3D) &&
- (keydata->data[12] == 0x03) &&
- (keydata->data[13] == 0x01) &&
- (keydata->data[14] == 0x07)) {
+ } else if (oid == ONAK_OID_NISTP256) {
length = 256;
- /* nistp384 / 1.3.132.0.34 */
- } else if ((keydata->data[6] == 5) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x81) &&
- (keydata->data[9] == 0x04) &&
- (keydata->data[10] == 0x00) &&
- (keydata->data[11] == 0x22)) {
+ } else if (oid == ONAK_OID_NISTP384) {
length = 384;
- /* nistp521 / 1.3.132.0.35 */
- } else if ((keydata->data[6] == 5) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x81) &&
- (keydata->data[9] == 0x04) &&
- (keydata->data[10] == 0x00) &&
- (keydata->data[11] == 0x23)) {
+ } else if (oid == ONAK_OID_NISTP521) {
length = 521;
- /* brainpoolP256r1 / 1.3.36.3.3.2.8.1.1.7 */
- } else if ((keydata->data[6] == 9) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x24) &&
- (keydata->data[9] == 0x03) &&
- (keydata->data[10] == 0x03) &&
- (keydata->data[11] == 0x02) &&
- (keydata->data[12] == 0x08) &&
- (keydata->data[13] == 0x01) &&
- (keydata->data[14] == 0x01) &&
- (keydata->data[15] == 0x07)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP256R1) {
length = 256;
- /* brainpoolP384r1 / 1.3.36.3.3.2.8.1.1.11 */
- } else if ((keydata->data[6] == 9) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x24) &&
- (keydata->data[9] == 0x03) &&
- (keydata->data[10] == 0x03) &&
- (keydata->data[11] == 0x02) &&
- (keydata->data[12] == 0x08) &&
- (keydata->data[13] == 0x01) &&
- (keydata->data[14] == 0x01) &&
- (keydata->data[15] == 0x0B)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP384R1) {
length = 384;
- /* brainpoolP512r1 / 1.3.36.3.3.2.8.1.1.13 */
- } else if ((keydata->data[6] == 9) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x24) &&
- (keydata->data[9] == 0x03) &&
- (keydata->data[10] == 0x03) &&
- (keydata->data[11] == 0x02) &&
- (keydata->data[12] == 0x08) &&
- (keydata->data[13] == 0x01) &&
- (keydata->data[14] == 0x01) &&
- (keydata->data[15] == 0x0D)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP512R1) {
length = 512;
- /* secp256k1 / 1.3.132.0.10 */
- } else if ((keydata->data[6] == 5) &&
- (keydata->data[7] == 0x2B) &&
- (keydata->data[8] == 0x81) &&
- (keydata->data[9] == 0x04) &&
- (keydata->data[10] == 0x00) &&
- (keydata->data[11] == 0x0A)) {
+ } else if (oid == ONAK_OID_SECP256K1) {
length = 256;
} else {
logthing(LOGTHING_ERROR,
@@ -196,8 +125,8 @@ unsigned int keylength(struct openpgp_packet *keydata)
}
break;
default:
- length = (keydata->data[6] << 8) +
- keydata->data[7];
+ length = (keydata->data[keyofs] << 8) +
+ keydata->data[keyofs + 1];
}
break;
default:
@@ -218,7 +147,9 @@ int list_sigs(struct onak_dbctx *dbctx,
while (sigs != NULL) {
sigid = sig_keyid(sigs->packet);
- uid = dbctx->keyid2uid(dbctx, sigid);
+ if (dbctx) {
+ uid = dbctx->keyid2uid(dbctx, sigid);
+ }
if (sigs->packet->data[0] == 4 &&
sigs->packet->data[1] == 0x30) {
/* It's a Type 4 sig revocation */
@@ -228,25 +159,25 @@ int list_sigs(struct onak_dbctx *dbctx,
}
if (html && uid != NULL) {
printf("%s %08" PRIX64
+ "search=0x%016" PRIX64 "\">0x%016" PRIX64
" "
"%s\n",
sig,
sigid,
- sigid & 0xFFFFFFFF,
+ sigid,
sigid,
txt2html(uid));
} else if (html && uid == NULL) {
- printf("%s %08" PRIX64 " "
+ printf("%s 0x%016" PRIX64 " "
"[User id not found]\n",
sig,
- sigid & 0xFFFFFFFF);
+ sigid);
} else {
- printf("%s %08" PRIX64
+ printf("%s 0x%016" PRIX64
" %s\n",
sig,
- sigid & 0xFFFFFFFF,
+ sigid,
(uid != NULL) ? uid :
"[User id not found]");
}
@@ -300,7 +231,7 @@ int list_subkeys(struct onak_dbctx *dbctx,
struct openpgp_signedpacket_list *subkeys, bool verbose,
bool html)
{
- struct tm *created = NULL;
+ struct tm created;
time_t created_time = 0;
int type = 0;
int length = 0;
@@ -313,7 +244,7 @@ int list_subkeys(struct onak_dbctx *dbctx,
(subkeys->packet->data[2] << 16) +
(subkeys->packet->data[3] << 8) +
subkeys->packet->data[4];
- created = gmtime(&created_time);
+ gmtime_r(&created_time, &created);
switch (subkeys->packet->data[0]) {
case 2:
@@ -321,11 +252,12 @@ int list_subkeys(struct onak_dbctx *dbctx,
type = subkeys->packet->data[7];
break;
case 4:
+ case 5:
type = subkeys->packet->data[5];
break;
default:
logthing(LOGTHING_ERROR,
- "Unknown key type: %d",
+ "Unknown key version: %d",
subkeys->packet->data[0]);
}
length = keylength(subkeys->packet);
@@ -334,13 +266,13 @@ int list_subkeys(struct onak_dbctx *dbctx,
&keyid) != ONAK_E_OK) {
logthing(LOGTHING_ERROR, "Couldn't get keyid.");
}
- printf("sub %5d%c/%08X %04d/%02d/%02d\n",
+ printf("sub %5d%c/0x%016" PRIX64 " %04d/%02d/%02d\n",
length,
pkalgo2char(type),
- (uint32_t) (keyid & 0xFFFFFFFF),
- created->tm_year + 1900,
- created->tm_mon + 1,
- created->tm_mday);
+ keyid,
+ created.tm_year + 1900,
+ created.tm_mon + 1,
+ created.tm_mday);
}
if (verbose) {
@@ -416,13 +348,14 @@ int key_index(struct onak_dbctx *dbctx,
bool skshash, bool html)
{
struct openpgp_signedpacket_list *curuid = NULL;
- struct tm *created = NULL;
+ struct tm created;
time_t created_time = 0;
int type = 0;
int length = 0;
char buf[1024];
uint64_t keyid;
+
if (html) {
puts("");
}
@@ -432,7 +365,7 @@ int key_index(struct onak_dbctx *dbctx,
(keys->publickey->data[2] << 16) +
(keys->publickey->data[3] << 8) +
keys->publickey->data[4];
- created = gmtime(&created_time);
+ gmtime_r(&created_time, &created);
switch (keys->publickey->data[0]) {
case 2:
@@ -440,10 +373,11 @@ int key_index(struct onak_dbctx *dbctx,
type = keys->publickey->data[7];
break;
case 4:
+ case 5:
type = keys->publickey->data[5];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
length = keylength(keys->publickey);
@@ -454,23 +388,23 @@ int key_index(struct onak_dbctx *dbctx,
if (html) {
printf("pub %5d%c/%08" PRIX64
+ "search=0x%016" PRIX64 "\">0x%016" PRIX64
" %04d/%02d/%02d ",
length,
pkalgo2char(type),
keyid,
- keyid & 0xFFFFFFFF,
- created->tm_year + 1900,
- created->tm_mon + 1,
- created->tm_mday);
+ keyid,
+ created.tm_year + 1900,
+ created.tm_mon + 1,
+ created.tm_mday);
} else {
- printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
+ printf("pub %5d%c/0x%016" PRIX64 " %04d/%02d/%02d ",
length,
pkalgo2char(type),
- keyid & 0xFFFFFFFF,
- created->tm_year + 1900,
- created->tm_mon + 1,
- created->tm_mday);
+ keyid,
+ created.tm_year + 1900,
+ created.tm_mon + 1,
+ created.tm_mday);
}
curuid = keys->uids;
@@ -557,6 +491,7 @@ int mrkey_index(struct openpgp_publickey *keys)
type = keys->publickey->data[7];
break;
case 4:
+ case 5:
(void) get_fingerprint(keys->publickey, &fingerprint);
for (i = 0; i < fingerprint.length; i++) {
@@ -566,7 +501,7 @@ int mrkey_index(struct openpgp_publickey *keys)
type = keys->publickey->data[5];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
length = keylength(keys->publickey);