diff options
| author | Matt Caswell <matt@openssl.org> | 2019-12-18 11:14:29 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-12-23 10:22:21 +0000 |
| commit | 285c691304890364a6126e9302415490b35130e5 (patch) | |
| tree | fa2f3e551af34e07f0a32c1cba2dd1b6550e1bd9 /providers/defltprov.c | |
| parent | 501fcfb8cfc1aa114ffde437039c2dc2827554ae (diff) | |
| download | openssl-285c691304890364a6126e9302415490b35130e5.zip openssl-285c691304890364a6126e9302415490b35130e5.tar.gz openssl-285c691304890364a6126e9302415490b35130e5.tar.bz2 | |
Fix no-dh
The new serializer code broke no-dh builds so we add some more guards to fix it.
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/10644)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index b8e96f9..51cd2b9 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -399,6 +399,7 @@ static const OSSL_ALGORITHM deflt_serializer[] = { { "RSA", "default=yes,format=pem,type=public", rsa_pub_pem_serializer_functions }, +#ifndef OPENSSL_NO_DH { "DH", "default=yes,format=text,type=private", dh_priv_text_serializer_functions }, { "DH", "default=yes,format=text,type=public", @@ -417,6 +418,7 @@ static const OSSL_ALGORITHM deflt_serializer[] = { dh_pub_pem_serializer_functions }, { "DH", "default=yes,format=pem,type=domainparams", dh_param_pem_serializer_functions }, +#endif { NULL, NULL, NULL } }; |