diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-01-30 02:23:03 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-01-30 02:23:03 +0000 |
| commit | a87030a1edf0e4c6d601895f810b2d0da84ee10a (patch) | |
| tree | 398075a9540e68b2dc417a80ac83fe13e5253958 /ssl | |
| parent | 15701211b57b63f1f91a9c3781ea91c019b1dc1d (diff) | |
| download | openssl-new-a87030a1edf0e4c6d601895f810b2d0da84ee10a.tar.gz | |
Make DSA_generate_parameters, and fix a couple of bug
(including another problem in the s3_srvr.c state machine).
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_srvr.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index d6158dbc65..ce68732e60 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -963,6 +963,14 @@ static int ssl3_send_server_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY); goto f_err; } + + if (s->s3->tmp.dh != NULL) + { + DH_free(dh); + SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_INTERNAL_ERROR); + goto err; + } + if ((dh=DHparams_dup(dhp)) == NULL) { SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); @@ -1109,7 +1117,7 @@ static int ssl3_send_server_key_exchange(SSL *s) s->init_off=0; } - /* SSL3_ST_SW_KEY_EXCH_B */ + s->state = SSL3_ST_SW_KEY_EXCH_B; return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); f_err: ssl3_send_alert(s,SSL3_AL_FATAL,al); |