diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-13 07:49:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-13 07:49:50 +0000 |
| commit | 7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06 (patch) | |
| tree | d5d217cd4d21932fa490076d0dea9a259a9a8a31 /openssl/ssl/s2_srvr.c | |
| parent | 125aba11ec484309e4dc5b2abf1b15ac98784159 (diff) | |
| download | vcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.tar.gz vcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.tar.bz2 vcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.zip | |
Updated to openssl-1.0.0d
Diffstat (limited to 'openssl/ssl/s2_srvr.c')
| -rw-r--r-- | openssl/ssl/s2_srvr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openssl/ssl/s2_srvr.c b/openssl/ssl/s2_srvr.c index 947167687..bc885e8e7 100644 --- a/openssl/ssl/s2_srvr.c +++ b/openssl/ssl/s2_srvr.c @@ -403,13 +403,14 @@ static int get_client_master_key(SSL *s) p+=3; n2s(p,i); s->s2->tmp.clear=i; n2s(p,i); s->s2->tmp.enc=i; - n2s(p,i); s->session->key_arg_length=i; - if(s->session->key_arg_length > SSL_MAX_KEY_ARG_LENGTH) + n2s(p,i); + if(i > SSL_MAX_KEY_ARG_LENGTH) { ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR); SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_KEY_ARG_TOO_LONG); return -1; } + s->session->key_arg_length=i; s->state=SSL2_ST_GET_CLIENT_MASTER_KEY_B; } |