diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2021-01-14 14:43:11 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-21 18:08:02 +0100 |
| commit | f23e4a17a2309793a0ac787725736f1c4474c804 (patch) | |
| tree | e449cb58462d714eddd2ea51ece55a8f43d8223d /crypto/evp/dh_ctrl.c | |
| parent | 6d9a54c6e661094c0668f0307213789c2d9be3ec (diff) | |
Fixes related to broken DH support in CMS
- DH support should work with both DH and DHX keys
- UKM parameter is optional so it can have length 0
Fixes #13810
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13869)
Diffstat (limited to 'crypto/evp/dh_ctrl.c')
| -rw-r--r-- | crypto/evp/dh_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/dh_ctrl.c b/crypto/evp/dh_ctrl.c index 64492389b7..7cf589f60b 100644 --- a/crypto/evp/dh_ctrl.c +++ b/crypto/evp/dh_ctrl.c @@ -514,7 +514,7 @@ int EVP_PKEY_CTX_set0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int len) int ret; OSSL_PARAM params[2], *p = params; - if (len <= 0) + if (len < 0) return -1; ret = dh_param_derive_check(ctx); |