Clean up of code

4 files changed, 51 insertions, 62 deletions

diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 1818247e59..daf4ef48b7 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -275,10 +275,10 @@ suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
 %%     {krb5, idea_cbc, md5};
 
 %% TLS v1.1 suites
-suite({rsa, null, md5}) ->
-    ?TLS_RSA_WITH_NULL_MD5;
-suite({rsa, null, sha}) ->
-    ?TLS_RSA_WITH_NULL_SHA;
+%%suite({rsa, null, md5}) ->
+%%    ?TLS_RSA_WITH_NULL_MD5;
+%%suite({rsa, null, sha}) ->
+%%    ?TLS_RSA_WITH_NULL_SHA;
 suite({rsa, rc4_128, md5}) ->
     ?TLS_RSA_WITH_RC4_128_MD5;
 suite({rsa, rc4_128, sha}) ->
@@ -424,8 +424,7 @@ bulk_cipher_algorithm(null) ->
 %% Not supported yet
 %% bulk_cipher_algorithm(idea_cbc) ->
 %%     ?IDEA;
-bulk_cipher_algorithm(Cipher) when Cipher == rc4_56;
-				   Cipher == rc4_128 ->
+bulk_cipher_algorithm(rc4_128) ->
     ?RC4;
 %% bulk_cipher_algorithm(des40_cbc) ->
 %%     ?DES40;
@@ -438,7 +437,6 @@ bulk_cipher_algorithm(Cipher) when Cipher == aes_128_cbc;
     ?AES.
 
 type(Cipher) when Cipher == null;
-		  Cipher == rc4_56;
 		  Cipher == rc4_128 ->
     ?STREAM;
 
@@ -455,10 +453,8 @@ key_material(null) ->
 key_material(Cipher) when Cipher == idea_cbc;
  			  Cipher == rc4_128 ->
     16;
-key_material(rc4_56) ->
-    7;
-key_material(des40_cbc) ->	
-    5;
+%%key_material(des40_cbc) ->	
+%%   5;
 key_material(des_cbc) ->
     8;
 key_material('3des_ede_cbc') ->
@@ -471,7 +467,6 @@ key_material(aes_256_cbc) ->
 expanded_key_material(null) ->
     0;
 expanded_key_material(Cipher) when Cipher == idea_cbc;
-				   Cipher == rc4_56;
  				   Cipher == rc4_128 ->
     16;
 expanded_key_material(Cipher) when Cipher == des_cbc;
@@ -486,10 +481,9 @@ expanded_key_material(Cipher) when Cipher == aes_128_cbc;
 
 effective_key_bits(null) ->
     0;
-effective_key_bits(des40_cbc) -> 
-    40;
-effective_key_bits(Cipher) when Cipher == rc4_56;
-				Cipher == des_cbc ->
+%%effective_key_bits(des40_cbc) -> 
+%%    40;
+effective_key_bits(des_cbc) ->
     56;
 effective_key_bits(Cipher) when Cipher == idea_cbc;
 				Cipher == rc4_128;
@@ -501,7 +495,6 @@ effective_key_bits(aes_256_cbc) ->
     256.
 
 iv_size(Cipher) when Cipher == null;
-		     Cipher == rc4_56;
 		     Cipher == rc4_128 ->
     0;
 iv_size(Cipher) ->
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 6fef043d06..75faac9a95 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1052,10 +1052,9 @@ init_certificates(#ssl_options{cacertfile = CACertFile,
     case ssl_manager:connection_init(CACertFile, Role) of
 	{ok, CertDbRef, CacheRef} ->
 	    init_certificates(CertDbRef, CacheRef, CertFile, Role);
-	{error, {badmatch, Reason}} ->
-	    handle_file_error(error, Reason, CACertFile, ecacertfile);
 	{error, Reason} ->
-	    handle_file_error(error, Reason, CACertFile, ecacertfile)
+	    handle_file_error(?LINE, error, Reason, CACertFile, ecacertfile,
+			      erlang:get_stacktrace())
     end.
 
 init_certificates(CertDbRef, CacheRef, CertFile, client) -> 
@@ -1071,37 +1070,37 @@ init_certificates(CertDbRef, CacheRef, CertFile, server) ->
 	[OwnCert] = ssl_certificate:file_to_certificats(CertFile),
 	{ok, CertDbRef, CacheRef, OwnCert}
      catch
-	 Error:{badmatch, Reason={error,_}} ->
-	     handle_file_error(Error, Reason, CertFile, ecertfile);
 	 Error:Reason ->
-	     handle_file_error(Error, Reason, CertFile, ecertfile)
+	     handle_file_error(?LINE, Error, Reason, CertFile, ecertfile,
+			       erlang:get_stacktrace())
      end.
 
 init_private_key(undefined, "", _Password, client) -> 
     undefined;
 init_private_key(undefined, KeyFile, Password, _)  -> 
-    try 
-	{ok, List} = ssl_manager:cache_pem_file(KeyFile),
-	[Der] = [Der || Der = {PKey, _ , _} <- List,
-			PKey =:= rsa_private_key orelse 
-			    PKey =:= dsa_private_key],
-	{ok, Decoded} = public_key:decode_private_key(Der,Password),
-	Decoded
-    catch
-	Error:{badmatch, Reason={error,_}} ->
-	    handle_file_error(Error, Reason, KeyFile, ekeyfile);
-	  Error:Reason ->
-	    handle_file_error(Error, Reason, KeyFile, ekeyfile)
+    case ssl_manager:cache_pem_file(KeyFile) of
+	{ok, List} ->
+	    [Der] = [Der || Der = {PKey, _ , _} <- List,
+			    PKey =:= rsa_private_key orelse 
+				PKey =:= dsa_private_key],
+	    {ok, Decoded} = public_key:decode_private_key(Der,Password),
+	    Decoded;
+	{error, Reason} -> 
+	    handle_file_error(?LINE, error, Reason, KeyFile, ekeyfile,
+			      erlang:get_stacktrace()) 
     end;
 
 init_private_key(PrivateKey, _, _,_) ->
     PrivateKey.
 
+handle_file_error(Line, Error, {badmatch, Reason}, File, Throw, Stack) ->
+    file_error(Line, Error, Reason, File, Throw, Stack);
+handle_file_error(Line, Error, Reason, File, Throw, Stack) ->
+    file_error(Line, Error, Reason, File, Throw, Stack).
 
-handle_file_error(Error, Reason, File, Throw) ->
+file_error(Line, Error, Reason, File, Throw, Stack) ->
     Report = io_lib:format("SSL: ~p: ~p:~p ~s~n  ~p~n",
-			   [?LINE, Error, Reason, File, 
-			    erlang:get_stacktrace()]),
+			   [Line, Error, Reason, File, Stack]),
     error_logger:error_report(Report),
     throw(Throw).
 
@@ -1110,13 +1109,17 @@ init_diffie_hellman(_, client) ->
 init_diffie_hellman(undefined, _) ->
     ?DEFAULT_DIFFIE_HELLMAN_PARAMS;
 init_diffie_hellman(DHParamFile, server) ->
-    {ok, List} = ssl_manager:cache_pem_file(DHParamFile),
-    case [Der || Der = {dh_params, _ , _} <- List] of
-	[Der] ->
-	    {ok, Decoded} = public_key:decode_dhparams(Der),
-	    Decoded;
-	[] ->
-	    ?DEFAULT_DIFFIE_HELLMAN_PARAMS
+    case ssl_manager:cache_pem_file(DHParamFile) of
+	{ok, List} ->
+	    case [Der || Der = {dh_params, _ , _} <- List] of
+		[Der] ->
+		    {ok, Decoded} = public_key:decode_dhparams(Der),
+		    Decoded;
+		[] ->
+		    ?DEFAULT_DIFFIE_HELLMAN_PARAMS
+	    end;
+	{error, Reason} ->
+	    handle_file_error(?LINE, error, Reason, DHParamFile, edhfile,  erlang:get_stacktrace()) 
     end.
 
 sync_send_all_state_event(FsmPid, Event) ->
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 539ddd936a..8b5d9221bc 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -179,10 +179,8 @@ handle_call({{connection_init, TrustedcertsFile, _Role}, Pid}, _From,
 	    {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, TrustedcertsFile, Db),
 	    {ok, Ref, Cache}
 	catch
-	    _:{badmatch, Error} ->
-		{error, Error};
-	    _E:_R ->
-		{error, {_R,erlang:get_stacktrace()}}
+	    _:Reason ->
+		{error, Reason}
 	end,
     {reply, Result, State};
 
@@ -204,14 +202,10 @@ handle_call({{cache_pem, File},Pid}, _, State = #state{certificate_db = Db}) ->
     try ssl_certificate_db:cache_pem_file(Pid,File,Db) of
 	Result ->
 	    {reply, Result, State}
-    catch _:{badmatch, Reason} ->
-	    {reply, Reason, State};
-	  _:Reason ->
+    catch 
+	_:Reason ->
 	    {reply, {error, Reason}, State}
-    end;
-	       
-handle_call(_,_, State) ->
-    {reply, ok, State}.
+    end.
 %%--------------------------------------------------------------------
 %% Function: handle_cast(Msg, State) -> {noreply, State} |
 %%                                      {noreply, State, Timeout} |
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index f9f915f13d..c867848c31 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -29,6 +29,7 @@
 -include("ssl_internal.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_handshake.hrl").
+-include("ssl_cipher.hrl").
 -include("ssl_debug.hrl").
 
 %% Connection state handling
@@ -532,12 +533,10 @@ initial_connection_state(ConnectionEnd) ->
                      }.
 
 initial_security_params(ConnectionEnd) ->
-    #security_parameters{connection_end = ConnectionEnd,
-                         bulk_cipher_algorithm = ?NULL,
-                         mac_algorithm = ?NULL,         
-                         compression_algorithm = ?NULL,
-                         cipher_type = ?NULL
-                        }.
+    SecParams = #security_parameters{connection_end = ConnectionEnd,
+				     compression_algorithm = ?NULL},
+    ssl_cipher:security_parameters(?TLS_NULL_WITH_NULL_NULL, 
+				   SecParams).
 
 empty_connection_state(ConnectionEnd) ->
     SecParams = empty_security_params(ConnectionEnd),