diff options
-rw-r--r-- | lib/x509_xml.c | 6 | ||||
-rw-r--r-- | libextra/gnutls_openpgp.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/x509_xml.c b/lib/x509_xml.c index 62a219e2d4..9afa33cd0d 100644 --- a/lib/x509_xml.c +++ b/lib/x509_xml.c @@ -263,11 +263,7 @@ _gnutls_asn1_get_structure_xml(ASN1_TYPE structure, const char *name, STR_APPEND(" type=\"OBJECT ID\""); break; case TYPE_ANY: -// if (p->type&CONST_DEFINED_BY) { -// STR_APPEND(" type=\"ANY DEFINED BY\""); -// } else { - STR_APPEND(" type=\"ANY\""); -// } + STR_APPEND(" type=\"ANY\""); if (!p->down) STR_APPEND(" encoding=\"HEX\""); break; case TYPE_CONSTANT: { diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index 9974006bec..cabd92b8d6 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -1877,6 +1877,9 @@ gnutls_openpgp_key_to_xml( const gnutls_datum *cert, s = "</OPENPGPKEY>\n"; ret = _gnutls_string_append_str( &string_xml_key, s); if (ret < 0) return ret; + + ret = _gnutls_string_append_data( &string_xml_key, "\n\0", 2); + if (ret < 0) return ret; *xmlkey = _gnutls_string2datum( &string_xml_key); |