diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-15 11:20:58 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-06 11:59:07 +0000 |
| commit | 0f00ed7720257512924a7c891336d66e1c1083fa (patch) | |
| tree | 72155959e8f6e167d68d2804148e23dd806a3967 /ssl/ssl_local.h | |
| parent | c8f6c28a938fc887ee3d2337f09db453e7fb0369 (diff) | |
Use the OPENSSL_CTX and property query string in EVP_PKEY_CTX
When we use an EVP_PKEY_CTX in libssl we should be doing so with the
OPENSSL_CTX and property query string that were specified when the
SSL_CTX object was first created.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10854)
Diffstat (limited to 'ssl/ssl_local.h')
| -rw-r--r-- | ssl/ssl_local.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index eefc4ea31d..31c01328ce 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -2411,7 +2411,7 @@ __owur int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, size_t len, DOWNGRADE dgrd); __owur int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen, int free_pms); -__owur EVP_PKEY *ssl_generate_pkey(EVP_PKEY *pm); +__owur EVP_PKEY *ssl_generate_pkey(SSL *s, EVP_PKEY *pm); __owur int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int genmaster); __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh); |