diff options
| author | Stef Walter <stefw@gnome.org> | 2013-04-04 08:04:10 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-04-04 08:04:10 +0200 |
| commit | d6e0982658acb231333ebfbfb7efff8b762231d0 (patch) | |
| tree | c44466ce011d93da0503f306e0a4c933a9e5ade8 /trust/parser.c | |
| parent | 032fbd8806333bdaf0201cfd9d7bcaac8ec75184 (diff) | |
| download | p11-kit-d6e0982658acb231333ebfbfb7efff8b762231d0.tar.gz | |
Don't print erroneous debug messages when skipping files
The parser automatically skips over files that it cannot parse. Don't
print confusing debug messages about DER parse failures when it does so.
Diffstat (limited to 'trust/parser.c')
| -rw-r--r-- | trust/parser.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/trust/parser.c b/trust/parser.c index b2555b1..7690d6a 100644 --- a/trust/parser.c +++ b/trust/parser.c @@ -264,13 +264,14 @@ parse_der_x509_certificate (p11_parser *parser, const unsigned char *data, size_t length) { + char message[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; CK_BYTE idv[ID_LENGTH]; CK_ATTRIBUTE id = { CKA_ID, idv, sizeof (idv) }; CK_ATTRIBUTE *attrs; CK_ATTRIBUTE *value; node_asn *cert; - cert = p11_asn1_decode (parser->asn1_defs, "PKIX1.Certificate", data, length, NULL); + cert = p11_asn1_decode (parser->asn1_defs, "PKIX1.Certificate", data, length, message); if (cert == NULL) return P11_PARSE_UNRECOGNIZED; @@ -557,6 +558,7 @@ parse_openssl_trusted_certificate (p11_parser *parser, const unsigned char *data, size_t length) { + char message[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; CK_ATTRIBUTE *attrs; CK_BYTE idv[ID_LENGTH]; CK_ATTRIBUTE id = { CKA_ID, idv, sizeof (idv) }; @@ -579,11 +581,11 @@ parse_openssl_trusted_certificate (p11_parser *parser, if (cert_len <= 0) return P11_PARSE_UNRECOGNIZED; - cert = p11_asn1_decode (parser->asn1_defs, "PKIX1.Certificate", data, cert_len, NULL); + cert = p11_asn1_decode (parser->asn1_defs, "PKIX1.Certificate", data, cert_len, message); if (cert == NULL) return P11_PARSE_UNRECOGNIZED; - aux = p11_asn1_decode (parser->asn1_defs, "OPENSSL.CertAux", data + cert_len, length - cert_len, NULL); + aux = p11_asn1_decode (parser->asn1_defs, "OPENSSL.CertAux", data + cert_len, length - cert_len, message); if (aux == NULL) { asn1_delete_structure (&cert); return P11_PARSE_UNRECOGNIZED; |