diff options
| author |   jsing <jsing@openbsd.org> | 2015-09-12 10:25:38 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-09-12 10:25:38 +0000 |
| commit | afeb7bea68b1921a6145ad4b984f9c2c75bd75f9 (patch) | |
| tree | 66299458003182d5b900cf551696978cafcbf711 /lib/libssl/src | |
| parent | More ifmedia64 fallout; that should be the last. (diff) | |
| download | wireguard-openbsd-afeb7bea68b1921a6145ad4b984f9c2c75bd75f9.tar.xz wireguard-openbsd-afeb7bea68b1921a6145ad4b984f9c2c75bd75f9.zip | |
Pull variable assignment out from function call, fix indentation and set
state after calling ssl3_handshake_msg_finish().
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/s3_clnt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c index 1424641047e..c2da4289559 100644 --- a/lib/libssl/src/ssl/s3_clnt.c +++ b/lib/libssl/src/ssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.128 2015/09/12 10:09:16 jsing Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.129 2015/09/12 10:25:38 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1974,8 +1974,8 @@ ssl3_send_client_key_exchange(SSL *s) /* Generate master key from the result. */ s->session->master_key_length = - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key, p, n); + s->method->ssl3_enc->generate_master_secret(s, + s->session->master_key, p, n); /* Clean up. */ memset(p, 0, n); @@ -2131,9 +2131,8 @@ ssl3_send_client_key_exchange(SSL *s) goto err; } - pkey_ctx = EVP_PKEY_CTX_new( - pub_key = X509_get_pubkey(peer_cert), - NULL); + pub_key = X509_get_pubkey(peer_cert); + pkey_ctx = EVP_PKEY_CTX_new(pub_key, NULL); /* * If we have send a certificate, and certificate key @@ -2232,9 +2231,9 @@ ssl3_send_client_key_exchange(SSL *s) goto err; } - s->state = SSL3_ST_CW_KEY_EXCH_B; - ssl3_handshake_msg_finish(s, n); + + s->state = SSL3_ST_CW_KEY_EXCH_B; } /* SSL3_ST_CW_KEY_EXCH_B */ |