diff options
Diffstat (limited to 'libextra/openpgp/xml.c')
| -rw-r--r-- | libextra/openpgp/xml.c | 542 |
1 files changed, 283 insertions, 259 deletions
diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c index 8acee71c98..a4ef438380 100644 --- a/libextra/openpgp/xml.c +++ b/libextra/openpgp/xml.c @@ -29,308 +29,329 @@ #include <x509/rfc2818.h> /* for MAX_CN */ static int -xml_add_tag(gnutls_string * xmlkey, const char *tag, const char *val) +xml_add_tag (gnutls_string * xmlkey, const char *tag, const char *val) { - if (!xmlkey || !tag || !val) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + if (!xmlkey || !tag || !val) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - _gnutls_string_append_str(xmlkey, " <"); - _gnutls_string_append_str(xmlkey, tag); - _gnutls_string_append_str(xmlkey, ">"); - _gnutls_string_append_str(xmlkey, val); - _gnutls_string_append_str(xmlkey, "</"); - _gnutls_string_append_str(xmlkey, tag); - _gnutls_string_append_str(xmlkey, ">\n"); + _gnutls_string_append_str (xmlkey, " <"); + _gnutls_string_append_str (xmlkey, tag); + _gnutls_string_append_str (xmlkey, ">"); + _gnutls_string_append_str (xmlkey, val); + _gnutls_string_append_str (xmlkey, "</"); + _gnutls_string_append_str (xmlkey, tag); + _gnutls_string_append_str (xmlkey, ">\n"); - return 0; + return 0; } static int -xml_add_mpi2(gnutls_string * xmlkey, const uint8 * data, size_t count, - const char *tag) +xml_add_mpi2 (gnutls_string * xmlkey, const uint8 * data, size_t count, + const char *tag) { - char *p = NULL; - size_t i; - int rc = 0; - - if (!xmlkey || !data || !tag) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + char *p = NULL; + size_t i; + int rc = 0; + + if (!xmlkey || !data || !tag) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - p = gnutls_calloc(1, 2 * (count + 3)); - if (!p) { - gnutls_assert(); - return GNUTLS_E_MEMORY_ERROR; + p = gnutls_calloc (1, 2 * (count + 3)); + if (!p) + { + gnutls_assert (); + return GNUTLS_E_MEMORY_ERROR; } - for (i = 0; i < count; i++) - sprintf(p + 2 * i, "%02X", data[i]); - p[2 * count] = '\0'; + for (i = 0; i < count; i++) + sprintf (p + 2 * i, "%02X", data[i]); + p[2 * count] = '\0'; - rc = xml_add_tag(xmlkey, tag, p); - gnutls_free(p); + rc = xml_add_tag (xmlkey, tag, p); + gnutls_free (p); - return rc; + return rc; } static int -xml_add_mpi(gnutls_string * xmlkey, cdk_pkt_pubkey_t pk, int idx, - const char *tag) +xml_add_mpi (gnutls_string * xmlkey, cdk_pkt_pubkey_t pk, int idx, + const char *tag) { - uint8 buf[4096]; - size_t nbytes; + uint8 buf[4096]; + size_t nbytes; - nbytes = sizeof buf - 1; - cdk_pk_get_mpi(pk, idx, buf, &nbytes, NULL); - return xml_add_mpi2(xmlkey, buf, nbytes, tag); + nbytes = sizeof buf - 1; + cdk_pk_get_mpi (pk, idx, buf, &nbytes, NULL); + return xml_add_mpi2 (xmlkey, buf, nbytes, tag); } -static int xml_add_key_mpi(gnutls_string * xmlkey, cdk_pkt_pubkey_t pk) +static int +xml_add_key_mpi (gnutls_string * xmlkey, cdk_pkt_pubkey_t pk) { - const char *s = " <KEY ENCODING=\"HEX\"/>\n"; - int rc = 0; + const char *s = " <KEY ENCODING=\"HEX\"/>\n"; + int rc = 0; - if (!xmlkey || !pk) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + if (!xmlkey || !pk) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - _gnutls_string_append_str(xmlkey, s); - - if (is_RSA(pk->pubkey_algo)) { - rc = xml_add_mpi(xmlkey, pk, 0, "RSA-N"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 1, "RSA-E"); - } else if (is_DSA(pk->pubkey_algo)) { - rc = xml_add_mpi(xmlkey, pk, 0, "DSA-P"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 1, "DSA-Q"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 2, "DSA-G"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 3, "DSA-Y"); - } else if (is_ELG(pk->pubkey_algo)) { - rc = xml_add_mpi(xmlkey, pk, 0, "ELG-P"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 1, "ELG-G"); - if (!rc) - rc = xml_add_mpi(xmlkey, pk, 2, "ELG-Y"); - } else - return GNUTLS_E_UNWANTED_ALGORITHM; - - return 0; + _gnutls_string_append_str (xmlkey, s); + + if (is_RSA (pk->pubkey_algo)) + { + rc = xml_add_mpi (xmlkey, pk, 0, "RSA-N"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 1, "RSA-E"); + } + else if (is_DSA (pk->pubkey_algo)) + { + rc = xml_add_mpi (xmlkey, pk, 0, "DSA-P"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 1, "DSA-Q"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 2, "DSA-G"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 3, "DSA-Y"); + } + else if (is_ELG (pk->pubkey_algo)) + { + rc = xml_add_mpi (xmlkey, pk, 0, "ELG-P"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 1, "ELG-G"); + if (!rc) + rc = xml_add_mpi (xmlkey, pk, 2, "ELG-Y"); + } + else + return GNUTLS_E_UNWANTED_ALGORITHM; + + return 0; } static int -xml_add_key(gnutls_string * xmlkey, int ext, cdk_pkt_pubkey_t pk, int sub) +xml_add_key (gnutls_string * xmlkey, int ext, cdk_pkt_pubkey_t pk, int sub) { - const char *algo, *s; - char keyid[16], fpr[41], tmp[32]; - uint8 fingerpr[20]; - unsigned int kid[2]; - int i = 0, rc = 0; - - if (!xmlkey || !pk) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + const char *algo, *s; + char keyid[16], fpr[41], tmp[32]; + uint8 fingerpr[20]; + unsigned int kid[2]; + int i = 0, rc = 0; + + if (!xmlkey || !pk) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - s = sub ? " <SUBKEY>\n" : " <MAINKEY>\n"; - _gnutls_string_append_str(xmlkey, s); + s = sub ? " <SUBKEY>\n" : " <MAINKEY>\n"; + _gnutls_string_append_str (xmlkey, s); - cdk_pk_get_keyid(pk, kid); - snprintf(keyid, 16, "%08lX%08lX", kid[0], kid[1]); - rc = xml_add_tag(xmlkey, "KEYID", keyid); - if (rc) - return rc; + cdk_pk_get_keyid (pk, kid); + snprintf (keyid, 16, "%08lX%08lX", kid[0], kid[1]); + rc = xml_add_tag (xmlkey, "KEYID", keyid); + if (rc) + return rc; - cdk_pk_get_fingerprint(pk, fingerpr); - for (i = 0; i < 20; i++) - sprintf(fpr + 2 * i, "%02X", fingerpr[i]); - fpr[40] = '\0'; - rc = xml_add_tag(xmlkey, "FINGERPRINT", fpr); - if (rc) - return rc; + cdk_pk_get_fingerprint (pk, fingerpr); + for (i = 0; i < 20; i++) + sprintf (fpr + 2 * i, "%02X", fingerpr[i]); + fpr[40] = '\0'; + rc = xml_add_tag (xmlkey, "FINGERPRINT", fpr); + if (rc) + return rc; - if (is_DSA(pk->pubkey_algo)) - algo = "DSA"; - else if (is_RSA(pk->pubkey_algo)) - algo = "RSA"; - else if (is_ELG(pk->pubkey_algo)) - algo = "ELG"; - else - algo = "???"; - rc = xml_add_tag(xmlkey, "PKALGO", algo); - if (rc) - return rc; + if (is_DSA (pk->pubkey_algo)) + algo = "DSA"; + else if (is_RSA (pk->pubkey_algo)) + algo = "RSA"; + else if (is_ELG (pk->pubkey_algo)) + algo = "ELG"; + else + algo = "???"; + rc = xml_add_tag (xmlkey, "PKALGO", algo); + if (rc) + return rc; - sprintf(tmp, "%d", cdk_pk_get_nbits(pk)); - rc = xml_add_tag(xmlkey, "KEYLEN", tmp); - if (rc) - return rc; + sprintf (tmp, "%d", cdk_pk_get_nbits (pk)); + rc = xml_add_tag (xmlkey, "KEYLEN", tmp); + if (rc) + return rc; - sprintf(tmp, "%lu", pk->timestamp); - rc = xml_add_tag(xmlkey, "CREATED", tmp); - if (rc) - return rc; + sprintf (tmp, "%lu", pk->timestamp); + rc = xml_add_tag (xmlkey, "CREATED", tmp); + if (rc) + return rc; - if (pk->expiredate > 0) { - sprintf(tmp, "%lu", (unsigned long) pk->expiredate); - rc = xml_add_tag(xmlkey, "EXPIREDATE", tmp); - if (rc) - return rc; + if (pk->expiredate > 0) + { + sprintf (tmp, "%lu", (unsigned long) pk->expiredate); + rc = xml_add_tag (xmlkey, "EXPIREDATE", tmp); + if (rc) + return rc; } - sprintf(tmp, "%d", pk->is_revoked); - rc = xml_add_tag(xmlkey, "REVOKED", tmp); - if (rc) - return rc; + sprintf (tmp, "%d", pk->is_revoked); + rc = xml_add_tag (xmlkey, "REVOKED", tmp); + if (rc) + return rc; - if (ext) { - rc = xml_add_key_mpi(xmlkey, pk); - if (rc) - return rc; + if (ext) + { + rc = xml_add_key_mpi (xmlkey, pk); + if (rc) + return rc; } - s = sub ? " </SUBKEY>\n" : " </MAINKEY>\n"; - _gnutls_string_append_str(xmlkey, s); + s = sub ? " </SUBKEY>\n" : " </MAINKEY>\n"; + _gnutls_string_append_str (xmlkey, s); - return 0; + return 0; } static int -xml_add_userid(gnutls_string * xmlkey, int ext, - const char *dn, cdk_pkt_userid_t id) +xml_add_userid (gnutls_string * xmlkey, int ext, + const char *dn, cdk_pkt_userid_t id) { - const char *s; - char tmp[32]; - int rc = 0; - - if (!xmlkey || !dn || !id) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + const char *s; + char tmp[32]; + int rc = 0; + + if (!xmlkey || !dn || !id) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - s = " <USERID>\n"; - _gnutls_string_append_str(xmlkey, s); + s = " <USERID>\n"; + _gnutls_string_append_str (xmlkey, s); - rc = xml_add_tag(xmlkey, "NAME", dn); - if (rc) - return rc; + rc = xml_add_tag (xmlkey, "NAME", dn); + if (rc) + return rc; - if (ext) { - sprintf(tmp, "%d", id->is_primary); - rc = xml_add_tag(xmlkey, "PRIMARY", tmp); - if (rc) - return rc; - sprintf(tmp, "%d", id->is_revoked); - rc = xml_add_tag(xmlkey, "REVOKED", tmp); - if (rc) - return rc; + if (ext) + { + sprintf (tmp, "%d", id->is_primary); + rc = xml_add_tag (xmlkey, "PRIMARY", tmp); + if (rc) + return rc; + sprintf (tmp, "%d", id->is_revoked); + rc = xml_add_tag (xmlkey, "REVOKED", tmp); + if (rc) + return rc; } - s = " </USERID>\n"; - _gnutls_string_append_str(xmlkey, s); + s = " </USERID>\n"; + _gnutls_string_append_str (xmlkey, s); - return 0; + return 0; } static int -xml_add_sig(gnutls_string * xmlkey, int ext, cdk_pkt_signature_t sig) +xml_add_sig (gnutls_string * xmlkey, int ext, cdk_pkt_signature_t sig) { - const char *algo, *s; - char tmp[32], keyid[16]; - unsigned int kid[2]; - int rc = 0; - - if (!xmlkey || !sig) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + const char *algo, *s; + char tmp[32], keyid[16]; + unsigned int kid[2]; + int rc = 0; + + if (!xmlkey || !sig) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - s = " <SIGNATURE>\n"; - _gnutls_string_append_str(xmlkey, s); + s = " <SIGNATURE>\n"; + _gnutls_string_append_str (xmlkey, s); - sprintf(tmp, "%d", sig->version); - rc = xml_add_tag(xmlkey, "VERSION", tmp); - if (rc) - return rc; + sprintf (tmp, "%d", sig->version); + rc = xml_add_tag (xmlkey, "VERSION", tmp); + if (rc) + return rc; - if (ext) { - sprintf(tmp, "%d", sig->sig_class); - rc = xml_add_tag(xmlkey, "SIGCLASS", tmp); - if (rc) - return rc; + if (ext) + { + sprintf (tmp, "%d", sig->sig_class); + rc = xml_add_tag (xmlkey, "SIGCLASS", tmp); + if (rc) + return rc; } - sprintf(tmp, "%d", sig->flags.expired); - rc = xml_add_tag(xmlkey, "EXPIRED", tmp); - if (rc) - return rc; + sprintf (tmp, "%d", sig->flags.expired); + rc = xml_add_tag (xmlkey, "EXPIRED", tmp); + if (rc) + return rc; - if (ext) { - switch (sig->pubkey_algo) { + if (ext) + { + switch (sig->pubkey_algo) + { case GCRY_PK_DSA: - algo = "DSA"; - break; + algo = "DSA"; + break; case GCRY_PK_ELG: case GCRY_PK_ELG_E: - algo = "ELG"; - break; + algo = "ELG"; + break; case GCRY_PK_RSA: case GCRY_PK_RSA_E: case GCRY_PK_RSA_S: - algo = "RSA"; - break; + algo = "RSA"; + break; default: - algo = "???"; /* unknown algorithm */ + algo = "???"; /* unknown algorithm */ } - rc = xml_add_tag(xmlkey, "PKALGO", algo); - if (rc) - return rc; + rc = xml_add_tag (xmlkey, "PKALGO", algo); + if (rc) + return rc; - switch (sig->digest_algo) { + switch (sig->digest_algo) + { case GCRY_MD_SHA1: - algo = "SHA1"; - break; + algo = "SHA1"; + break; case GCRY_MD_RMD160: - algo = "RMD160"; - break; + algo = "RMD160"; + break; case GCRY_MD_MD5: - algo = "MD5"; - break; + algo = "MD5"; + break; default: - algo = "???"; + algo = "???"; } - rc = xml_add_tag(xmlkey, "MDALGO", algo); - if (rc) - return rc; + rc = xml_add_tag (xmlkey, "MDALGO", algo); + if (rc) + return rc; } - sprintf(tmp, "%lu", sig->timestamp); - rc = xml_add_tag(xmlkey, "CREATED", tmp); - if (rc) - return rc; + sprintf (tmp, "%lu", sig->timestamp); + rc = xml_add_tag (xmlkey, "CREATED", tmp); + if (rc) + return rc; - cdk_sig_get_keyid(sig, kid); - snprintf(keyid, 16, "%08lX%08lX", kid[0], kid[1]); - rc = xml_add_tag(xmlkey, "KEYID", keyid); - if (rc) - return rc; + cdk_sig_get_keyid (sig, kid); + snprintf (keyid, 16, "%08lX%08lX", kid[0], kid[1]); + rc = xml_add_tag (xmlkey, "KEYID", keyid); + if (rc) + return rc; - s = " </SIGNATURE>\n"; - _gnutls_string_append_str(xmlkey, s); + s = " </SIGNATURE>\n"; + _gnutls_string_append_str (xmlkey, s); - return 0; + return 0; } @@ -344,72 +365,75 @@ xml_add_sig(gnutls_string * xmlkey, int ext, cdk_pkt_signature_t sig) * a XML string. **/ int -gnutls_openpgp_key_to_xml(gnutls_openpgp_key_t key, - gnutls_datum_t * xmlkey, int ext) +gnutls_openpgp_key_to_xml (gnutls_openpgp_key_t key, + gnutls_datum_t * xmlkey, int ext) { - cdk_kbnode_t node, ctx = NULL; - cdk_packet_t pkt; - char name[MAX_CN]; - size_t name_len; - const char *s; - int idx = 0, rc = 0; - gnutls_string string_xml_key; - - if (!key || !xmlkey) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; + cdk_kbnode_t node, ctx = NULL; + cdk_packet_t pkt; + char name[MAX_CN]; + size_t name_len; + const char *s; + int idx = 0, rc = 0; + gnutls_string string_xml_key; + + if (!key || !xmlkey) + { + gnutls_assert (); + return GNUTLS_E_INVALID_REQUEST; } - _gnutls_string_init(&string_xml_key, malloc, realloc, free); - memset(xmlkey, 0, sizeof *xmlkey); + _gnutls_string_init (&string_xml_key, malloc, realloc, free); + memset (xmlkey, 0, sizeof *xmlkey); - s = "<?xml version=\"1.0\"?>\n\n"; - _gnutls_string_append_str(&string_xml_key, s); + s = "<?xml version=\"1.0\"?>\n\n"; + _gnutls_string_append_str (&string_xml_key, s); - s = "<gnutls:openpgp:key version=\"1.0\">\n"; - _gnutls_string_append_str(&string_xml_key, s); + s = "<gnutls:openpgp:key version=\"1.0\">\n"; + _gnutls_string_append_str (&string_xml_key, s); - s = " <OPENPGPKEY>\n"; - _gnutls_string_append_str(&string_xml_key, s); + s = " <OPENPGPKEY>\n"; + _gnutls_string_append_str (&string_xml_key, s); - idx = 1; - while ((node = cdk_kbnode_walk(key->knode, &ctx, 0))) { - pkt = cdk_kbnode_get_packet(node); - switch (pkt->pkttype) { + idx = 1; + while ((node = cdk_kbnode_walk (key->knode, &ctx, 0))) + { + pkt = cdk_kbnode_get_packet (node); + switch (pkt->pkttype) + { case CDK_PKT_PUBLIC_KEY: - rc = xml_add_key(&string_xml_key, ext, pkt->pkt.public_key, 0); - break; + rc = xml_add_key (&string_xml_key, ext, pkt->pkt.public_key, 0); + break; case CDK_PKT_PUBLIC_SUBKEY: - rc = xml_add_key(&string_xml_key, ext, pkt->pkt.public_key, 1); - break; + rc = xml_add_key (&string_xml_key, ext, pkt->pkt.public_key, 1); + break; case CDK_PKT_USER_ID: - name_len = sizeof(name); - gnutls_openpgp_key_get_name(key, idx, name, &name_len); - rc = xml_add_userid(&string_xml_key, ext, name, - pkt->pkt.user_id); - idx++; - break; + name_len = sizeof (name); + gnutls_openpgp_key_get_name (key, idx, name, &name_len); + rc = xml_add_userid (&string_xml_key, ext, name, pkt->pkt.user_id); + idx++; + break; case CDK_PKT_SIGNATURE: - rc = xml_add_sig(&string_xml_key, ext, pkt->pkt.signature); - break; + rc = xml_add_sig (&string_xml_key, ext, pkt->pkt.signature); + break; default: - break; + break; } } - if (!rc) { - s = " </OPENPGPKEY>\n"; - _gnutls_string_append_str(&string_xml_key, s); + if (!rc) + { + s = " </OPENPGPKEY>\n"; + _gnutls_string_append_str (&string_xml_key, s); } - s = "</gnutls:openpgp:key>\n"; - _gnutls_string_append_str(&string_xml_key, s); - _gnutls_string_append_data(&string_xml_key, "\n\0", 2); + s = "</gnutls:openpgp:key>\n"; + _gnutls_string_append_str (&string_xml_key, s); + _gnutls_string_append_data (&string_xml_key, "\n\0", 2); - *xmlkey = _gnutls_string2datum(&string_xml_key); - xmlkey->size--; + *xmlkey = _gnutls_string2datum (&string_xml_key); + xmlkey->size--; - return rc; + return rc; } |