diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-06-09 17:34:55 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-06-10 17:58:27 +0200 |
| commit | ef0449135c4e4e7f04bbeafbd76ce7b5c0518088 (patch) | |
| tree | 2d3f76716b0dc63313a35a3ea8da49cf5effe7f3 /apps/include/apps.h | |
| parent | bedda72ff771a41c317daa7bdb7cbe14608fbc03 (diff) | |
Fix s_server app to not report an error when using a non DH certificate.
Fixes #15071
It always tries loading the cert as DH which previously did not produce
an error. The errors are not suppressed for these operations.
The output now matches previous versions of OpenSSL.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15670)
Diffstat (limited to 'apps/include/apps.h')
| -rw-r--r-- | apps/include/apps.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index 47a5f7f6f4..c9f77f6067 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -121,6 +121,9 @@ EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin, const char *pass, ENGINE *e, const char *desc); EVP_PKEY *load_keyparams(const char *uri, int format, int maybe_stdin, const char *keytype, const char *desc); +EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin, + const char *keytype, const char *desc, + int suppress_decode_errors); char *next_item(char *opt); /* in list separated by comma and/or space */ int load_cert_certs(const char *uri, X509 **pcert, STACK_OF(X509) **pcerts, |