generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssl/s3_[clnt|srvr].c: fix warnings and linking error.

Browse Source
This commit is contained in:
Andy Polyakov 2013-02-09 19:47:44 +01:00
parent 6a2f94b39a
commit 71a1ac9398
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/s3_clnt.c
View File

@ -888,7 +888,10 @@ int ssl3_get_server_hello(SSL *s)
} }
s->s3->tmp.new_cipher=c; s->s3->tmp.new_cipher=c;
if (!ssl3_digest_cached_records(s)) if (!ssl3_digest_cached_records(s))
{
al = SSL_AD_INTERNAL_ERROR;
goto f_err; goto f_err;
}
/* lets get the compression algorithm */ /* lets get the compression algorithm */
/* COMPRESSION */ /* COMPRESSION */
@ -968,7 +971,9 @@ int ssl3_get_server_hello(SSL *s)
return(1); return(1);
f_err: f_err:
ssl3_send_alert(s,SSL3_AL_FATAL,al); ssl3_send_alert(s,SSL3_AL_FATAL,al);
#ifndef OPENSSL_NO_TLSEXT
err: err:
#endif
return(-1); return(-1);
} }

5
ssl/s3_srvr.c
View File

@ -1269,7 +1269,10 @@ int ssl3_get_client_hello(SSL *s)
} }
if (!ssl3_digest_cached_records(s)) if (!ssl3_digest_cached_records(s))
{
al = SSL_AD_INTERNAL_ERROR;
goto f_err; goto f_err;
}
/* we now have the following setup. /* we now have the following setup.
* client_random * client_random
@ -1282,6 +1285,7 @@ int ssl3_get_client_hello(SSL *s)
* s->tmp.new_cipher - the new cipher to use. * s->tmp.new_cipher - the new cipher to use.
*/ */
#ifndef OPENSSL_NO_TLSEXT
/* Handles TLS extensions that we couldn't check earlier */ /* Handles TLS extensions that we couldn't check earlier */
if (s->version >= SSL3_VERSION) if (s->version >= SSL3_VERSION)
{ {
@ -1291,6 +1295,7 @@ int ssl3_get_client_hello(SSL *s)
goto err; goto err;
} }
} }
#endif
if (ret < 0) ret=1; if (ret < 0) ret=1;
if (0) if (0)