diff options
| author | Matt Caswell <matt@openssl.org> | 2020-11-23 12:01:34 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-24 17:18:18 +0000 |
| commit | ee8252847d1ccf39a48ab382971f8f18ac3f4089 (patch) | |
| tree | 61187c42d8ab6d802fdf541226e76d092bad7c08 | |
| parent | 273144fa5bdcfd3068601a095f9595b7a2a40ece (diff) | |
Undeprecate the -dsaparam option in the dhparam app
The -dsaparam option was deprecated because it was previously using
deprecated functions in order to operate. This is no longer the case
and therefore does not need to be deprecated.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13485)
| -rw-r--r-- | apps/dhparam.c | 4 | ||||
| -rw-r--r-- | doc/man1/openssl-dhparam.pod.in | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index 6717c952e9..e2fb38d8c0 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -124,11 +124,7 @@ int dhparam_main(int argc, char **argv) text = 1; break; case OPT_DSAPARAM: -# ifdef OPENSSL_NO_DEPRECATED_3_0 - BIO_printf(bio_err, "The dsaparam option is deprecated.\n"); -# else dsaparam = 1; -# endif break; case OPT_2: g = 2; diff --git a/doc/man1/openssl-dhparam.pod.in b/doc/man1/openssl-dhparam.pod.in index 98d0a00c6b..2b67943f1f 100644 --- a/doc/man1/openssl-dhparam.pod.in +++ b/doc/man1/openssl-dhparam.pod.in @@ -57,8 +57,6 @@ as the input filename. =item B<-dsaparam> -This option is deprecated. - If this option is used, DSA rather than DH parameters are read or created; they are converted to DH format. Otherwise, "strong" primes (such that (p-1)/2 is also prime) will be used for DH parameter generation. @@ -128,7 +126,7 @@ L<openssl-dsaparam(1)> =head1 HISTORY -The B<-dsaparam> and B<-engine> options were deprecated in OpenSSL 3.0. +The B<-engine> option was deprecated in OpenSSL 3.0. The B<-C> option was removed in OpenSSL 3.0. |