diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-19 12:42:01 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:33:54 +0000 |
| commit | 1566497495b30054453b05d275c01d6db5211e2a (patch) | |
| tree | a1d5537c54452e0bd4fefcb327d82acdbc2ddf82 /ssl/s3_srvr.c | |
| parent | 712548231e101f11c06e729e2330a7f3155b2d7e (diff) | |
Fix source where indent will not be able to cope
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Conflicts:
crypto/ec/ec_curve.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 14a2ebd5eb..506fb9feeb 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1103,8 +1103,9 @@ int ssl3_get_client_hello(SSL *s) } /* else cookie verification succeeded */ } + /* default verification */ else if ( memcmp(s->d1->rcvd_cookie, s->d1->cookie, - s->d1->cookie_len) != 0) /* default verification */ + s->d1->cookie_len) != 0) { al=SSL_AD_HANDSHAKE_FAILURE; SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, @@ -2195,7 +2196,7 @@ int ssl3_get_client_key_exchange(SSL *s) SSL3_ST_SR_KEY_EXCH_A, SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE, - 2048, /* ??? */ + 2048, &ok); if (!ok) return((int)n); @@ -3627,11 +3628,12 @@ int ssl3_get_next_proto(SSL *s) return -1; } + /* See the payload format below */ n=s->method->ssl_get_message(s, SSL3_ST_SR_NEXT_PROTO_A, SSL3_ST_SR_NEXT_PROTO_B, SSL3_MT_NEXT_PROTO, - 514, /* See the payload format below */ + 514, &ok); if (!ok) |