From: Andy Polyakov <appro@openssl.org>
Date: Sat, 9 Feb 2013 18:47:44 +0000 (+0100)
Subject: ssl/s3_[clnt|srvr].c: fix warnings and linking error.
X-Git-Tag: OpenSSL_1_0_0l~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71a1ac9398e0ee59d9040da7670164b744d0bc7c;p=oweals%2Fopenssl.git

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

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index fc53161866..f1f9c219ed 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -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);
 	}
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b4a6a37d88..14aa451e0f 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -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)