diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-01-02 13:19:49 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-01-02 13:19:49 +0100 |
| commit | 9c69c7d944e5c054b372e2a9be8a047051d271b9 (patch) | |
| tree | 90cf01a75a0ab7e15ef645e12c7884c59cbeb090 /src | |
| parent | a9c40fbf23fbba94b096d2036c22c8f557eb4f0a (diff) | |
| download | gnutls-9c69c7d944e5c054b372e2a9be8a047051d271b9.tar.gz | |
certtool: don't print PKCS#8 information when outputting DER data
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/certtool.c b/src/certtool.c index 026abfa9d7..8fcf37a535 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -1903,7 +1903,10 @@ void privkey_info(common_info_st * cinfo) if (ret == GNUTLS_E_DECRYPTION_FAILED) { fprintf(stderr, "Encrypted structure detected...\n"); - pkcs8_info_int(&pem, incert_format, 1, outfile, ""); + if (outcert_format == GNUTLS_X509_FMT_DER) + pkcs8_info_int(&pem, incert_format, 1, stderr, ""); + else + pkcs8_info_int(&pem, incert_format, 1, outfile, ""); pass = get_password(cinfo, &flags, 0); @@ -3298,7 +3301,10 @@ static void print_bag_data(gnutls_pkcs12_bag_t bag) } if (type == GNUTLS_BAG_PKCS8_ENCRYPTED_KEY) { - pkcs8_info_int(&cdata, GNUTLS_X509_FMT_DER, 1, outfile, "\t"); + if (outcert_format == GNUTLS_X509_FMT_DER) + pkcs8_info_int(&cdata, GNUTLS_X509_FMT_DER, 1, stderr, "\t"); + else + pkcs8_info_int(&cdata, GNUTLS_X509_FMT_DER, 1, outfile, "\t"); } name = NULL; |