Bump debhelper compat level to 13

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 0ff0625929849713a2597bf36769f009badab90c..f8cc40771c63f85e845216b7b0c0a128e5e8fbda 100644 (file)
--- 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,17 +229,28 @@ onak_status_t sig_info(struct openpgp_packet *packet, uint64_t *keyid,
                        }
                        break;
                case 4:
+               case 5:
+                       if (keyid != NULL) {
+                               *keyid = 0;
+                       }
                        res = parse_subpackets(&packet->data[4],
                                        packet->length - 4,
                                        &length, keyid, creation);
                        if (res != ONAK_E_OK) {
                                return res;
                        }
-                       res = parse_subpackets(&packet->data[length + 4],
-                                       packet->length - (4 + length),
-                                       &length, keyid, creation);
-                       if (res != ONAK_E_OK) {
-                               return res;
+                       /*
+                        * Only look at the unhashed subpackets if we want the
+                        * keyid and it wasn't in the signed subpacket
+                        * section.
+                        */
+                       if (keyid != NULL && *keyid == 0) {
+                               res = parse_subpackets(&packet->data[length + 4],
+                                               packet->length - (4 + length),
+                                               &length, keyid, NULL);
+                               if (res != ONAK_E_OK) {
+                                       return res;
+                               }
                        }
                        break;
                default:
@@ -341,3 +364,82 @@ struct openpgp_fingerprint *keysubkeys(struct openpgp_publickey *key)
 
        return subkeys;
 }
+
+enum onak_oid onak_parse_oid(uint8_t *buf, size_t len)
+{
+       enum onak_oid oid;
+
+       /* Elliptic curve key size is based on OID */
+       if (len == 0 || (buf[0] >= len)) {
+               oid = ONAK_OID_INVALID;
+       /* Curve25519 / 1.3.6.1.4.1.3029.1.5.1 */
+       } else if ((buf[0] == 10) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x06) &&
+                       (buf[3] == 0x01) && (buf[4] == 0x04) &&
+                       (buf[5] == 0x01) && (buf[6] == 0x97) &&
+                       (buf[7] == 0x55) && (buf[8] == 0x01) &&
+                       (buf[9] == 0x05) && (buf[10] == 0x01)) {
+               oid = ONAK_OID_CURVE25519;
+       /* Ed25519 / 1.3.6.1.4.1.11591.15.1 */
+       } else if ((buf[0] == 9) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x06) &&
+                       (buf[3] == 0x01) && (buf[4] == 0x04) &&
+                       (buf[5] == 0x01) && (buf[6] == 0xDA) &&
+                       (buf[7] == 0x47) && (buf[8] == 0x0F) &&
+                       (buf[9] == 0x01)) {
+               oid = ONAK_OID_ED25519;
+       /* nistp256 / 1.2.840.10045.3.1.7 */
+       } else if ((buf[0] == 8) &&
+                       (buf[1] == 0x2A) && (buf[2] == 0x86) &&
+                       (buf[3] == 0x48) && (buf[4] == 0xCE) &&
+                       (buf[5] == 0x3D) && (buf[6] == 0x03) &&
+                       (buf[7] == 0x01) && (buf[8] == 0x07)) {
+               oid = ONAK_OID_NISTP256;
+       /* nistp384 / 1.3.132.0.34 */
+       } else if ((buf[0] == 5) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x81) &&
+                       (buf[3] == 0x04) && (buf[4] == 0x00) &&
+                       (buf[5] == 0x22)) {
+               oid = ONAK_OID_NISTP384;
+       /* nistp521 / 1.3.132.0.35 */
+       } else if ((buf[0] == 5) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x81) &&
+                       (buf[3] == 0x04) && (buf[4] == 0x00) &&
+                       (buf[5] == 0x23)) {
+               oid = ONAK_OID_NISTP521;
+       /* brainpoolP256r1 / 1.3.36.3.3.2.8.1.1.7 */
+       } else if ((buf[0] == 9) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x24) &&
+                       (buf[3] == 0x03) && (buf[4] == 0x03) &&
+                       (buf[5] == 0x02) && (buf[6] == 0x08) &&
+                       (buf[7] == 0x01) && (buf[8] == 0x01) &&
+                       (buf[9] == 0x07)) {
+               oid = ONAK_OID_BRAINPOOLP256R1;
+       /* brainpoolP384r1 / 1.3.36.3.3.2.8.1.1.11 */
+       } else if ((buf[0] == 9) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x24) &&
+                       (buf[3] == 0x03) && (buf[4] == 0x03) &&
+                       (buf[5] == 0x02) && (buf[6] == 0x08) &&
+                       (buf[7] == 0x01) && (buf[8] == 0x01) &&
+                       (buf[9] == 0x0B)) {
+               oid = ONAK_OID_BRAINPOOLP384R1;
+       /* brainpoolP512r1 / 1.3.36.3.3.2.8.1.1.13 */
+       } else if ((buf[0] == 9) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x24) &&
+                       (buf[3] == 0x03) && (buf[4] == 0x03) &&
+                       (buf[5] == 0x02) && (buf[6] == 0x08) &&
+                       (buf[7] == 0x01) && (buf[8] == 0x01) &&
+                       (buf[9] == 0x0D)) {
+               oid = ONAK_OID_BRAINPOOLP512R1;
+       /* secp256k1 / 1.3.132.0.10 */
+       } else if ((buf[0] == 5) &&
+                       (buf[1] == 0x2B) && (buf[2] == 0x81) &&
+                       (buf[3] == 0x04) && (buf[4] == 0x00) &&
+                       (buf[5] == 0x0A)) {
+               oid = ONAK_OID_SECP256K1;
+       } else {
+               oid = ONAK_OID_UNKNOWN;
+       }
+
+       return oid;
+}