summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-06 09:49:09 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-06 10:12:16 +0200
commit6446687d43968db27e6d959de49e34c0bcbf40e2 (patch)
tree43782b718cc3050d19618571fbd7d0401bb7372f
parenta9f22fd480dd9392a32f75c2ffc5f9c195215c76 (diff)
downloadgnutls-6446687d43968db27e6d959de49e34c0bcbf40e2.tar.gz
certtool: fix DER export with --p7-info
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--src/certtool.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/certtool.c b/src/certtool.c
index 514dd381fa..1eb4f9b808 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3841,15 +3841,17 @@ void pkcs7_info(common_info_st *cinfo, unsigned display_data)
app_exit(1);
}
} else {
- ret = gnutls_pkcs7_print(pkcs7, GNUTLS_CRT_PRINT_FULL, &str);
- if (ret < 0) {
- fprintf(stderr, "printing error: %s\n",
- gnutls_strerror(ret));
- app_exit(1);
- }
+ if (outcert_format == GNUTLS_X509_FMT_PEM) {
+ ret = gnutls_pkcs7_print(pkcs7, GNUTLS_CRT_PRINT_FULL, &str);
+ if (ret < 0) {
+ fprintf(stderr, "printing error: %s\n",
+ gnutls_strerror(ret));
+ app_exit(1);
+ }
- fprintf(outfile, "%s", str.data);
- gnutls_free(str.data);
+ fprintf(outfile, "%s", str.data);
+ gnutls_free(str.data);
+ }
size = lbuffer_size;
ret =