From db16e96833094bf3b13d562388b3de02bba8d73d Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 20 May 2010 09:41:20 +0000
Subject: Honor internal API

---
 lib/ssl/src/ssl_certificate.erl |  8 ++++----
 lib/ssl/src/ssl_handshake.erl   | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib/ssl')

diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 686e90a70c..37d5646673 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -67,7 +67,7 @@ trusted_cert_and_path(CertChain, CertDbRef, Verify) ->
 	    %% The root CA was not sent and can not be found, we fail if verify = true
 	    not_valid(?ALERT_REC(?FATAL, ?UNKNOWN_CA), Verify, {Cert, RestPath});
 	{{SerialNr, Issuer}, Path} ->
-	    case ssl_certificate_db:lookup_trusted_cert(CertDbRef, 
+	    case ssl_manager:lookup_trusted_cert(CertDbRef, 
 							SerialNr, Issuer) of
 		{ok, {BinCert,_}} ->
 		    {BinCert, Path, []};
@@ -85,7 +85,7 @@ certificate_chain(OwnCert, CertsDbRef) ->
     {ok, ErlCert} = public_key:pkix_decode_cert(OwnCert, otp),
     certificate_chain(ErlCert, OwnCert, CertsDbRef, [OwnCert]).
 
-file_to_certificats(File) ->
+file_to_certificats(File) -> 
     {ok, List} = ssl_manager:cache_pem_file(File),
     [Bin || {cert, Bin, not_encrypted} <- List].
 
@@ -148,7 +148,7 @@ certificate_chain(_CertsDbRef, Chain, _SerialNr, _Issuer, true) ->
     {ok, lists:reverse(Chain)};
 
 certificate_chain(CertsDbRef, Chain, SerialNr, Issuer, _SelfSigned) ->
-    case ssl_certificate_db:lookup_trusted_cert(CertsDbRef, 
+    case ssl_manager:lookup_trusted_cert(CertsDbRef, 
 						SerialNr, Issuer) of
 	{ok, {IssuerCert, ErlCert}} ->
 	    {ok, ErlCert} = public_key:pkix_decode_cert(IssuerCert, otp),
@@ -164,7 +164,7 @@ certificate_chain(CertsDbRef, Chain, SerialNr, Issuer, _SelfSigned) ->
     end.
 
 find_issuer(OtpCert, PrevCandidateKey) ->
-    case ssl_certificate_db:issuer_candidate(PrevCandidateKey) of
+    case ssl_manager:issuer_candidate(PrevCandidateKey) of
  	no_more_candidates ->
  	    {error, issuer_not_found};
  	{Key, {_Cert, ErlCertCandidate}} ->
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 54938e0fbc..3772e540b3 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1101,7 +1101,7 @@ certificate_authorities_from_db(CertDbRef) ->
     certificate_authorities_from_db(CertDbRef, no_candidate, []).
 
 certificate_authorities_from_db(CertDbRef, PrevKey, Acc) ->
-    case ssl_certificate_db:issuer_candidate(PrevKey) of
+    case ssl_manager:issuer_candidate(PrevKey) of
 	no_more_candidates ->
 	    lists:reverse(Acc);
 	{{CertDbRef, _, _} = Key, Cert} ->
@@ -1133,12 +1133,13 @@ setup_keys({3,0}, Exportable, MasterSecret,
 setup_keys({3,1}, _Exportable, MasterSecret,
 	   ServerRandom, ClientRandom, HashSize, KML, _EKML, IVS) ->
     ssl_tls1:setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize, 
-			KML, IVS);
+			KML, IVS).
 
-setup_keys({3,2}, _Exportable, MasterSecret,
-	   ServerRandom, ClientRandom, HashSize, KML, _EKML, _IVS) ->
-    ssl_tls1:setup_keys(MasterSecret, ServerRandom, 
-			ClientRandom, HashSize, KML).
+%% Uncomment when supported
+%% setup_keys({3,2}, _Exportable, MasterSecret,
+%% 	   ServerRandom, ClientRandom, HashSize, KML, _EKML, _IVS) ->
+%%     ssl_tls1:setup_keys(MasterSecret, ServerRandom, 
+%% 			ClientRandom, HashSize, KML).
 
 calc_finished({3, 0}, Role, MasterSecret, Hashes) ->
     ssl_ssl3:finished(Role, MasterSecret, Hashes);
-- 
cgit v1.2.3