X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=decodekey.c;h=28f8ceef39f90dd7151bc1f4692ac520d6487493;hb=85187675424f3854869f1607afd8a1e84e536946;hp=0ff0625929849713a2597bf36769f009badab90c;hpb=357fbc65bfab230bbf12313e8b458d8325a6174f;p=onak.git

diff --git a/decodekey.c b/decodekey.c
index 0ff0625..28f8cee 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -48,6 +48,8 @@ onak_status_t parse_subpackets(unsigned char *data, size_t len,
 	int offset = 0;
 	int length = 0;
 	int packetlen = 0;
+	struct openpgp_fingerprint fp;
+	int i;
 
 	assert(data != NULL);
 
@@ -122,6 +124,16 @@ onak_status_t parse_subpackets(unsigned char *data, size_t len,
 				*keyid += data[offset+packetlen - 1];
 			}
 			break;
+		case OPENPGP_SIGSUB_ISSUER_FINGER:
+			if ((packetlen - 2) <= MAX_FINGERPRINT_LEN &&
+					keyid != NULL) {
+				fp.length = packetlen - 2;
+				for (i = 0; i < fp.length; i++) {
+					fp.fp[i] = data[offset + i + 2];
+				}
+				*keyid = fingerprint2keyid(&fp);
+			}
+			break;
 		case OPENPGP_SIGSUB_EXPIRY:
 		case OPENPGP_SIGSUB_EXPORTABLE:
 		case OPENPGP_SIGSUB_TRUSTSIG:
@@ -134,7 +146,7 @@ onak_status_t parse_subpackets(unsigned char *data, size_t len,
 		case OPENPGP_SIGSUB_REVOCATION_KEY:
 		case OPENPGP_SIGSUB_ISSUER_UID:
 		case OPENPGP_SIGSUB_URL:
-		case OPENPGP_SIGSUB_ISSUER_FINGER:
+		case OPENPGP_SIGSUB_X_ISSUER_FINGER:
 		case OPENPGP_SIGSUB_NOTATION:
 		case OPENPGP_SIGSUB_PREFHASH:
 		case OPENPGP_SIGSUB_PREFCOMPRESS:
@@ -217,6 +229,7 @@ onak_status_t sig_info(struct openpgp_packet *packet, uint64_t *keyid,
 			}
 			break;
 		case 4:
+		case 5:
 			res = parse_subpackets(&packet->data[4],
 					packet->length - 4,
 					&length, keyid, creation);