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

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

PR: 2979
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index a17beb8a3b..7caabf38a4 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -893,7 +893,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 e49fc959c4..59ca04a0fd 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1131,6 +1131,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)
 		{
@@ -1140,6 +1141,7 @@ int ssl3_get_client_hello(SSL *s)
 			goto err;
 			}
 		}
+#endif
 
 	if (ret < 0) ret=1;
 	if (0)