summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-06 09:50:45 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-06 09:50:45 +0200
commit0adaabba583642b08420e0726440f8ff76798d57 (patch)
tree560773276220606df1ba7b7bca2b016b02351500
parent3f319435f54e4d1c1f5ffc3dbc88518048b61f51 (diff)
downloadgnutls-0adaabba583642b08420e0726440f8ff76798d57.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 e25b00ee48..cc50b0881c 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3788,15 +3788,17 @@ void pkcs7_info(common_info_st *cinfo, unsigned display_data)
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));
- 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));
+ exit(1);
+ }
- fprintf(outfile, "%s", str.data);
- gnutls_free(str.data);
+ fprintf(outfile, "%s", str.data);
+ gnutls_free(str.data);
+ }
size = lbuffer_size;
ret =