diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-08 09:27:03 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-08 10:36:33 +0200 |
| commit | d9aab739b19452cbf483de4c9f496aeb2d0307f1 (patch) | |
| tree | a417aa9b5110f3a071fe6812df5b2f19efc7e1c3 | |
| parent | 4c142d73c36207dbfef572a831d21aa8c3f52acf (diff) | |
| download | gnutls-tmp-gnutls_3_5_x_pkcs8.tar.gz | |
certtool: eliminated unused variabletmp-gnutls_3_5_x_pkcs8
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | src/certtool-common.c | 6 | ||||
| -rw-r--r-- | src/certtool-common.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c index 743b1df70a..115a912098 100644 --- a/src/certtool-common.c +++ b/src/certtool-common.c @@ -1218,7 +1218,7 @@ print_private_key(FILE *outfile, common_info_st * cinfo, gnutls_x509_privkey_t k if (!key) return; - if (!cinfo->pkcs8 && cinfo->no_compat == 0 && gnutls_x509_privkey_get_seed(key, NULL, NULL, 0) != GNUTLS_E_INVALID_REQUEST) { + if (!cinfo->pkcs8 && gnutls_x509_privkey_get_seed(key, NULL, NULL, 0) != GNUTLS_E_INVALID_REQUEST) { cinfo->pkcs8 = 1; flags |= GNUTLS_PKCS_PLAIN; } @@ -1287,7 +1287,6 @@ int generate_prime(FILE * outfile, int how, common_info_st * info) if (how != 0) { if (info->provable != 0) { gnutls_x509_privkey_t pkey; - unsigned save; ret = gnutls_x509_privkey_init(&pkey); if (ret < 0) { @@ -1322,10 +1321,7 @@ int generate_prime(FILE * outfile, int how, common_info_st * info) } if (info->outcert_format == GNUTLS_X509_FMT_PEM) { - save = info->no_compat; - info->no_compat = 1; print_private_key(outfile, info, pkey); - info->no_compat = save; } ret = gnutls_dh_params_import_dsa(dh_params, pkey); diff --git a/src/certtool-common.h b/src/certtool-common.h index b773b27ce6..8911b5a2cb 100644 --- a/src/certtool-common.h +++ b/src/certtool-common.h @@ -70,9 +70,6 @@ typedef struct common_info { /* when printing PKCS #11 objects, only print urls */ unsigned int only_urls; unsigned int verbose; - - /* set to non zero when no compatibility structs need to be exported */ - unsigned no_compat; } common_info_st; int cipher_to_flags(const char *cipher); |