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 a17beb8a3bf8a282298c06bd118e925241f3a411..7caabf38a4bea221c96a0cb94185fc3b48eb8bb7 100644 (file)
--- 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 e49fc959c417e4c06dde0c6707d56dbb86dabf44..59ca04a0fd205597d2e2c205de75d9703d07e5c5 100644 (file)
--- 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)