From 47be58961af29d665f91d8702c80a70ee43a33ed Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 28 May 2010 06:47:01 +0000
Subject: Added misssing version check for client.

---
 lib/ssl/src/ssl_handshake.erl | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'lib/ssl/src/ssl_handshake.erl')

diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 5f3dff8894..9ecd667e69 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -128,17 +128,22 @@ hello(#server_hello{cipher_suite = CipherSuite, server_version = Version,
 		    session_id = SessionId, renegotiation_info = Info},
       #ssl_options{secure_renegotiate = SecureRenegotation},
       ConnectionStates0, Renegotiation) ->
-    
-    case handle_renegotiation_info(client, Info, ConnectionStates0, 
-				   Renegotiation, SecureRenegotation, []) of
-	{ok, ConnectionStates1} ->
-	    ConnectionStates =
-		hello_pending_connection_states(client, CipherSuite, Random, 
-						Compression, ConnectionStates1),
-	    {Version, SessionId, ConnectionStates};
-	#alert{} = Alert ->
-	    Alert
-    end;
+
+    case ssl_record:is_acceptable_version(Version) of
+	true ->
+	    case handle_renegotiation_info(client, Info, ConnectionStates0, 
+					   Renegotiation, SecureRenegotation, []) of
+		{ok, ConnectionStates1} ->
+		    ConnectionStates =
+			hello_pending_connection_states(client, CipherSuite, Random, 
+							Compression, ConnectionStates1),
+		    {Version, SessionId, ConnectionStates};
+		#alert{} = Alert ->
+		    Alert
+	    end;
+	false ->
+	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
+    end.
 			       
 hello(#client_hello{client_version = ClientVersion, random = Random,
 		    cipher_suites = CipherSuites,
-- 
cgit v1.2.3