summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2013-08-27 21:37:29 +0200
committerStef Walter <stef@thewalter.net>2013-08-28 21:51:37 +0200
commit58466648aa84ea10c20213d4665c5c93dbf285e9 (patch)
tree45c175de76d1712bbdfcd69595d9346c234e7442
parent619e81b5ffe0677d1d511ef60b8451434c2a32a0 (diff)
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.
-rw-r--r--trust/token.c4
1 files changed, 2 insertions, 2 deletions
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);