Fix source where indent will not be able to cope
Conflicts: apps/ciphers.c ssl/s3_pkt.c Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
@@ -885,7 +885,7 @@ int ssl3_get_server_hello(SSL *s)
|
||||
SSL3_ST_CR_SRVR_HELLO_A,
|
||||
SSL3_ST_CR_SRVR_HELLO_B,
|
||||
-1,
|
||||
20000, /* ?? */
|
||||
20000,
|
||||
&ok);
|
||||
|
||||
if (!ok) return((int)n);
|
||||
@@ -2423,11 +2423,12 @@ int ssl3_get_server_done(SSL *s)
|
||||
int ok,ret=0;
|
||||
long n;
|
||||
|
||||
/* Second to last param should be very small, like 0 :-) */
|
||||
n=s->method->ssl_get_message(s,
|
||||
SSL3_ST_CR_SRVR_DONE_A,
|
||||
SSL3_ST_CR_SRVR_DONE_B,
|
||||
SSL3_MT_SERVER_DONE,
|
||||
30, /* should be very small, like 0 :-) */
|
||||
30,
|
||||
&ok);
|
||||
|
||||
if (!ok) return((int)n);
|
||||
@@ -3549,7 +3550,8 @@ int ssl3_check_cert_and_algorithm(SSL *s)
|
||||
{
|
||||
if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
|
||||
s) == 0)
|
||||
{ /* check failed */
|
||||
{
|
||||
/* check failed */
|
||||
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
|
||||
goto f_err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user