X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=keyindex.c;h=eeac56cac47d238c7c3c3e270a7178e535418095;hp=94f52f7e25c705d3644da6545c997092f529be3a;hb=743957a08f068529d3add3e8485678b4e5034195;hpb=85187675424f3854869f1607afd8a1e84e536946
diff --git a/keyindex.c b/keyindex.c
index 94f52f7..eeac56c 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -81,6 +81,7 @@ unsigned int keylength(struct openpgp_packet *keydata)
{
unsigned int length;
uint8_t keyofs;
+ enum onak_oid oid;
switch (keydata->data[0]) {
case 2:
@@ -97,101 +98,25 @@ unsigned int keylength(struct openpgp_packet *keydata)
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[keyofs] == 10) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x06) &&
- (keydata->data[keyofs + 3] == 0x01) &&
- (keydata->data[keyofs + 4] == 0x04) &&
- (keydata->data[keyofs + 5] == 0x01) &&
- (keydata->data[keyofs + 6] == 0x97) &&
- (keydata->data[keyofs + 7] == 0x55) &&
- (keydata->data[keyofs + 8] == 0x01) &&
- (keydata->data[keyofs + 9] == 0x05) &&
- (keydata->data[keyofs + 10] == 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[keyofs] == 9) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x06) &&
- (keydata->data[keyofs + 3] == 0x01) &&
- (keydata->data[keyofs + 4] == 0x04) &&
- (keydata->data[keyofs + 5] == 0x01) &&
- (keydata->data[keyofs + 6] == 0xDA) &&
- (keydata->data[keyofs + 7] == 0x47) &&
- (keydata->data[keyofs + 8] == 0x0F) &&
- (keydata->data[keyofs + 9] == 0x01)) {
+ } else if (oid == ONAK_OID_ED25519) {
length = 255;
- /* nistp256 / 1.2.840.10045.3.1.7 */
- } else if ((keydata->data[keyofs] == 8) &&
- (keydata->data[keyofs + 1] == 0x2A) &&
- (keydata->data[keyofs + 2] == 0x86) &&
- (keydata->data[keyofs + 3] == 0x48) &&
- (keydata->data[keyofs + 4] == 0xCE) &&
- (keydata->data[keyofs + 5] == 0x3D) &&
- (keydata->data[keyofs + 6] == 0x03) &&
- (keydata->data[keyofs + 7] == 0x01) &&
- (keydata->data[keyofs + 8] == 0x07)) {
+ } else if (oid == ONAK_OID_NISTP256) {
length = 256;
- /* nistp384 / 1.3.132.0.34 */
- } else if ((keydata->data[keyofs] == 5) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x81) &&
- (keydata->data[keyofs + 3] == 0x04) &&
- (keydata->data[keyofs + 4] == 0x00) &&
- (keydata->data[keyofs + 5] == 0x22)) {
+ } else if (oid == ONAK_OID_NISTP384) {
length = 384;
- /* nistp521 / 1.3.132.0.35 */
- } else if ((keydata->data[keyofs] == 5) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x81) &&
- (keydata->data[keyofs + 3] == 0x04) &&
- (keydata->data[keyofs + 4] == 0x00) &&
- (keydata->data[keyofs + 5] == 0x23)) {
+ } else if (oid == ONAK_OID_NISTP521) {
length = 521;
- /* brainpoolP256r1 / 1.3.36.3.3.2.8.1.1.7 */
- } else if ((keydata->data[keyofs] == 9) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x24) &&
- (keydata->data[keyofs + 3] == 0x03) &&
- (keydata->data[keyofs + 4] == 0x03) &&
- (keydata->data[keyofs + 5] == 0x02) &&
- (keydata->data[keyofs + 6] == 0x08) &&
- (keydata->data[keyofs + 7] == 0x01) &&
- (keydata->data[keyofs + 8] == 0x01) &&
- (keydata->data[keyofs + 9] == 0x07)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP256R1) {
length = 256;
- /* brainpoolP384r1 / 1.3.36.3.3.2.8.1.1.11 */
- } else if ((keydata->data[keyofs] == 9) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x24) &&
- (keydata->data[keyofs + 3] == 0x03) &&
- (keydata->data[keyofs + 4] == 0x03) &&
- (keydata->data[keyofs + 5] == 0x02) &&
- (keydata->data[keyofs + 6] == 0x08) &&
- (keydata->data[keyofs + 7] == 0x01) &&
- (keydata->data[keyofs + 8] == 0x01) &&
- (keydata->data[keyofs + 9] == 0x0B)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP384R1) {
length = 384;
- /* brainpoolP512r1 / 1.3.36.3.3.2.8.1.1.13 */
- } else if ((keydata->data[keyofs] == 9) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x24) &&
- (keydata->data[keyofs + 3] == 0x03) &&
- (keydata->data[keyofs + 4] == 0x03) &&
- (keydata->data[keyofs + 5] == 0x02) &&
- (keydata->data[keyofs + 6] == 0x08) &&
- (keydata->data[keyofs + 7] == 0x01) &&
- (keydata->data[keyofs + 8] == 0x01) &&
- (keydata->data[keyofs + 9] == 0x0D)) {
+ } else if (oid == ONAK_OID_BRAINPOOLP512R1) {
length = 512;
- /* secp256k1 / 1.3.132.0.10 */
- } else if ((keydata->data[keyofs] == 5) &&
- (keydata->data[keyofs + 1] == 0x2B) &&
- (keydata->data[keyofs + 2] == 0x81) &&
- (keydata->data[keyofs + 3] == 0x04) &&
- (keydata->data[keyofs + 4] == 0x00) &&
- (keydata->data[keyofs + 5] == 0x0A)) {
+ } else if (oid == ONAK_OID_SECP256K1) {
length = 256;
} else {
logthing(LOGTHING_ERROR,
@@ -222,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 */
@@ -232,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]");
}
@@ -339,10 +266,10 @@ 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),
+ keyid,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
@@ -460,20 +387,20 @@ 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,
+ 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,
+ keyid,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);