Revise ssl code to use a CERT_PKEY structure when outputting a

[openssl.git] / ssl / s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 4f884c69c1303b86299c5d5fcb041ff22444bcce..e7b477a5e723e9d1bf5776550fd40c374710920e 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2432,6 +2432,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                                {
                                /* Use client certificate key */
                                EVP_PKEY *clkey = s->cert->key->privatekey;
+                               dh_clnt = NULL;
                                if (clkey)
                                        dh_clnt = EVP_PKEY_get1_DH(clkey);
                                if (dh_clnt == NULL)
@@ -3176,7 +3177,7 @@ int ssl3_send_client_certificate(SSL *s)
                {
                s->state=SSL3_ST_CW_CERT_D;
                l=ssl3_output_cert_chain(s,
-                       (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
+                       (s->s3->tmp.cert_req == 2)?NULL:s->cert->key);
                s->init_num=(int)l;
                s->init_off=0;
                }