diff options
| author | Rémi Verschelde | 2017-05-27 17:50:43 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-05-27 19:08:07 +0200 |
| commit | 67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d (patch) | |
| tree | 3502be2b2ae57c73fa21bd7b4a20dc02aab3aa06 /thirdparty/openssl/crypto/evp/p_lib.c | |
| parent | 996f1ae29e8d9bd2719f0dc72bfde6a8d77b1b12 (diff) | |
| download | godot-67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d.tar.gz godot-67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d.tar.zst godot-67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d.zip | |
openssl: Sync with upstream 1.0.2l
Diffstat (limited to 'thirdparty/openssl/crypto/evp/p_lib.c')
| -rw-r--r-- | thirdparty/openssl/crypto/evp/p_lib.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/thirdparty/openssl/crypto/evp/p_lib.c b/thirdparty/openssl/crypto/evp/p_lib.c index c0171244d..545d04fd7 100644 --- a/thirdparty/openssl/crypto/evp/p_lib.c +++ b/thirdparty/openssl/crypto/evp/p_lib.c @@ -130,6 +130,14 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS, EVP_R_MISSING_PARAMETERS); goto err; } + + if (!EVP_PKEY_missing_parameters(to)) { + if (EVP_PKEY_cmp_parameters(to, from) == 1) + return 1; + EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS, EVP_R_DIFFERENT_PARAMETERS); + return 0; + } + if (from->ameth && from->ameth->param_copy) return from->ameth->param_copy(to, from); err: |