diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-15 16:57:00 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-15 16:57:00 +0300 |
| commit | 6ceffdd121df9391f30b75e67d07db8607b5d825 (patch) | |
| tree | 3c5de0faef96a7d9b4594a9b9d6009c0ec982d40 /ssl | |
| parent | 9c8fd367c4a9af4ec9f8b4075d8126ceddce1cd9 (diff) | |
Recent changes from 0.9.6-stable.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s2_clnt.c | 4 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 3f56f6480b..5c40996e1c 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -752,8 +752,8 @@ static int client_certificate(SSL *s) if (s->state == SSL2_ST_SEND_CLIENT_CERTIFICATE_A) { i=ssl2_read(s,(char *)&(buf[s->init_num]), - SSL2_MAX_CERT_CHALLENGE_LENGTH+1-s->init_num); - if (i<(SSL2_MIN_CERT_CHALLENGE_LENGTH+1-s->init_num)) + SSL2_MAX_CERT_CHALLENGE_LENGTH+2-s->init_num); + if (i<(SSL2_MIN_CERT_CHALLENGE_LENGTH+2-s->init_num)) return(ssl2_part_read(s,SSL_F_CLIENT_CERTIFICATE,i)); s->init_num += i; diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 5927a2842c..22a0b097ac 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -695,7 +695,7 @@ static int ssl3_get_server_hello(SSL *s) goto f_err; } - if (s->hit && (s->session->cipher != c)) + if (s->hit && (s->session->cipher_id != c->id)) { if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG)) |