commit 8a7cf2543ac9c06787cb191cdfb20d54e1e49ea3
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Oct 09 17:35:53 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:32:51 2014 +0200
tree ab8e750b7f6deabc557c509a2939123de9d980cb
parent ba958b8bdc8b4348800ad75435583d9f4225f703

Add a few #ifdefs

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 3cd87f9..32f1072 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1182,8 +1182,11 @@
     buf = ssl->in_hdr;
 
 #if defined(POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO)
-    if( ssl->transport == SSL_TRANSPORT_STREAM && ( buf[0] & 0x80 ) != 0 )
-        return ssl_parse_client_hello_v2( ssl );
+#if defined(POLARSSL_SSL_PROTO_DTLS)
+    if( ssl->transport == SSL_TRANSPORT_STREAM )
+#endif
+        if( ( buf[0] & 0x80 ) != 0 )
+            return ssl_parse_client_hello_v2( ssl );
 #endif
 
     SSL_DEBUG_BUF( 4, "record header", buf, ssl_hdr_len( ssl ) );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index fecce58..de85b67 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5302,13 +5302,21 @@
 static int ssl_check_version( const ssl_context *ssl, int major, int minor )
 {
     if( major < SSL_MIN_MAJOR_VERSION || major > SSL_MAX_MAJOR_VERSION ||
-        minor < SSL_MIN_MINOR_VERSION || minor > SSL_MAX_MINOR_VERSION ||
-        ( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
-          minor < SSL_MINOR_VERSION_2 ) )
+        minor < SSL_MIN_MINOR_VERSION || minor > SSL_MAX_MINOR_VERSION )
     {
         return( -1 );
     }
 
+#if defined(POLARSSL_SSL_PROTO_DTLS)
+    if( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
+        minor < SSL_MINOR_VERSION_2 )
+    {
+        return( -1 );
+    }
+#else
+    ((void) ssl);
+#endif
+
     return( 0 );
 }
 
@@ -5788,8 +5796,8 @@
             }
             else
             {
-#if defined(POLARSSL_SSL_PROTO_DTLS)
                 /* DTLS clients need to know renego is server-initiated */
+#if defined(POLARSSL_SSL_PROTO_DTLS)
                 if( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
                     ssl->endpoint == SSL_IS_CLIENT )
                 {