From 58466648aa84ea10c20213d4665c5c93dbf285e9 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 27 Aug 2013 21:37:29 +0200 Subject: trust: Prefer parsing the persist format to PEM This is because the persist format contains PEM, and if the PEM parser gets it first, then it'll ignore the other non PEM data. --- trust/token.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'trust') diff --git a/trust/token.c b/trust/token.c index 8670ff4..cfcdba6 100644 --- a/trust/token.c +++ b/trust/token.c @@ -748,8 +748,8 @@ p11_token_new (CK_SLOT_ID slot, token->parser = p11_parser_new (p11_builder_get_cache (token->builder)); return_val_if_fail (token->parser != NULL, NULL); - p11_parser_formats (token->parser, p11_parser_format_pem, - p11_parser_format_x509, p11_parser_format_persist, NULL); + p11_parser_formats (token->parser, p11_parser_format_persist, + p11_parser_format_pem, p11_parser_format_x509, NULL); token->loaded = p11_dict_new (p11_dict_str_hash, p11_dict_str_equal, free, free); return_val_if_fail (token->loaded != NULL, NULL); -- cgit v1.1