diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-04-03 22:35:24 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-04-04 07:51:07 +0200 |
| commit | a03c170957419e7bc8195c8e451e33c70305844e (patch) | |
| tree | 4a32ff3040526cb9f4ef34e08ac515f6f2560dbf | |
| parent | 1c8219eb5eb498ef7a109ee5a9e90311a6508853 (diff) | |
| download | gnutls-a03c170957419e7bc8195c8e451e33c70305844e.tar.gz | |
certtool: certtool --generate-dh-params will account for --outder
Resolves #5
| -rw-r--r-- | src/certtool-common.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c index d89295cd83..b74d069c0d 100644 --- a/src/certtool-common.c +++ b/src/certtool-common.c @@ -1032,18 +1032,23 @@ int generate_prime(FILE * outfile, int how, common_info_st * info) #endif } - print_dh_info(outfile, &p, &g, q_bits, info->cprint); + if (info->outcert_format == GNUTLS_X509_FMT_PEM) + print_dh_info(outfile, &p, &g, q_bits, info->cprint); if (!info->cprint) { /* generate a PKCS#3 structure */ size_t len = lbuffer_size; ret = gnutls_dh_params_export_pkcs3(dh_params, - GNUTLS_X509_FMT_PEM, + info->outcert_format, lbuffer, &len); if (ret == 0) { - fprintf(outfile, "\n%s", lbuffer); + if (info->outcert_format == GNUTLS_X509_FMT_PEM) + fprintf(outfile, "\n%s", lbuffer); + else + fwrite(lbuffer, 1, len, outfile); + } else { fprintf(stderr, "Error: %s\n", gnutls_strerror(ret)); |