projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the OPENSSL_CTX and property query string in EVP_PKEY_CTX
[openssl.git]
/
ssl
/
statem
/
statem_srvr.c
diff --git
a/ssl/statem/statem_srvr.c
b/ssl/statem/statem_srvr.c
index 256575f1a002e84f3f701131040b0b8ffe688113..ab032ae956fecc70622ec67af443079d8e226770 100644
(file)
--- a/
ssl/statem/statem_srvr.c
+++ b/
ssl/statem/statem_srvr.c
@@
-2568,7
+2568,7
@@
int tls_construct_server_key_exchange(SSL *s, WPACKET *pkt)
goto err;
}
goto err;
}
- s->s3.tmp.pkey = ssl_generate_pkey(pkdhp);
+ s->s3.tmp.pkey = ssl_generate_pkey(
s,
pkdhp);
if (s->s3.tmp.pkey == NULL) {
/* SSLfatal() already called */
goto err;
if (s->s3.tmp.pkey == NULL) {
/* SSLfatal() already called */
goto err;
@@
-3013,7
+3013,7
@@
static int tls_process_cke_rsa(SSL *s, PACKET *pkt)
return 0;
}
return 0;
}
- ctx = EVP_PKEY_CTX_new
(rsa, NULL
);
+ ctx = EVP_PKEY_CTX_new
_from_pkey(s->ctx->libctx, rsa, s->ctx->propq
);
if (ctx == NULL) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_RSA,
ERR_R_MALLOC_FAILURE);
if (ctx == NULL) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_RSA,
ERR_R_MALLOC_FAILURE);
@@
-3296,7
+3296,7
@@
static int tls_process_cke_gost(SSL *s, PACKET *pkt)
pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
}
pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
}
- pkey_ctx = EVP_PKEY_CTX_new
(pk, NULL
);
+ pkey_ctx = EVP_PKEY_CTX_new
_from_pkey(s->ctx->libctx, pk, s->ctx->propq
);
if (pkey_ctx == NULL) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_GOST,
ERR_R_MALLOC_FAILURE);
if (pkey_ctx == NULL) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_GOST,
ERR_R_MALLOC_FAILURE);