Commit 71a1ac93 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

parent 6a2f94b3

ssl/s3_clnt.c

+5 −0
Original line number Diff line number Diff line
@@ -888,7 +888,10 @@ int ssl3_get_server_hello(SSL *s) 
		}

	s->s3->tmp.new_cipher=c;

	if (!ssl3_digest_cached_records(s))

		{

		al = SSL_AD_INTERNAL_ERROR;

		goto f_err;

		}



	/* lets get the compression algorithm */

	/* COMPRESSION */
@@ -968,7 +971,9 @@ int ssl3_get_server_hello(SSL *s) 
	return(1);

f_err:

	ssl3_send_alert(s,SSL3_AL_FATAL,al);

#ifndef OPENSSL_NO_TLSEXT

err:

#endif

	return(-1);

	}

ssl/s3_srvr.c

+5 −0
Original line number Diff line number Diff line
@@ -1269,7 +1269,10 @@ int ssl3_get_client_hello(SSL *s) 
		}



	if (!ssl3_digest_cached_records(s))

		{

		al = SSL_AD_INTERNAL_ERROR;

		goto f_err;

		}

	

	/* we now have the following setup. 

	 * client_random
@@ -1282,6 +1285,7 @@ int ssl3_get_client_hello(SSL *s) 
	 * s->tmp.new_cipher	- the new cipher to use.

	 */



#ifndef OPENSSL_NO_TLSEXT

	/* Handles TLS extensions that we couldn't check earlier */

	if (s->version >= SSL3_VERSION)

		{
@@ -1291,6 +1295,7 @@ int ssl3_get_client_hello(SSL *s) 
			goto err;

			}

		}

#endif



	if (ret < 0) ret=1;

	if (0)