ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity

Conflicts:

	lib/ssl/src/ssl.app.src
	lib/ssl/src/ssl_manager.erl

7 files changed, 23 insertions, 22 deletions

diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 3b8145089e..53edeaf767 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -48,7 +48,7 @@ MODULES= \
 	ssl_sup \
 	inet_tls_dist \
 	ssl_certificate\
-	ssl_certificate_db\
+	ssl_pkix_db\
 	ssl_cipher \
 	ssl_srp_primes \
 	ssl_connection \
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 5c34de905e..06bf01e7e0 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -21,7 +21,7 @@
 	       ssl_connection,
 	       ssl_cipher,
 	       ssl_srp_primes,
-	       ssl_certificate_db,
+	       ssl_pkix_db,
 	       ssl_certificate,
 	       ssl_alert
 	       ]},
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 9e1c3a09bf..b186a1015a 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -240,7 +240,7 @@ find_issuer(OtpCert, CertDbHandle) ->
 			  Acc
 		  end,
 
-    try ssl_certificate_db:foldl(IsIssuerFun, issuer_not_found, CertDbHandle) of
+    try ssl_pkix_db:foldl(IsIssuerFun, issuer_not_found, CertDbHandle) of
 	issuer_not_found ->
 	    {error, issuer_not_found}
     catch 
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index de9260fd8c..c751e7fe45 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -2976,14 +2976,14 @@ handle_trusted_certs_db(#state{cert_db_ref = Ref,
 			       ssl_options = #ssl_options{cacertfile = undefined}}) ->
     %% Certs provided as DER directly can not be shared
     %% with other connections and it is safe to delete them when the connection ends.
-    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+    ssl_pkix_db:remove_trusted_certs(Ref, CertDb);
 handle_trusted_certs_db(#state{file_ref_db = undefined}) ->
     %% Something went wrong early (typically cacertfile does not exist) so there is nothing to handle
     ok;
 handle_trusted_certs_db(#state{cert_db_ref = Ref,
 			       file_ref_db = RefDb,
 			       ssl_options = #ssl_options{cacertfile = File}}) ->
-    case ssl_certificate_db:ref_count(Ref, RefDb, -1) of
+    case ssl_pkix_db:ref_count(Ref, RefDb, -1) of
 	0 ->
 	    ssl_manager:clean_cert_db(Ref, File);
 	_ ->
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 24ea86311f..77c634616e 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1685,7 +1685,7 @@ certificate_authorities_from_db(CertDbHandle, CertDbRef) ->
 			 (_, Acc) ->
 			      Acc
 		      end,
-    ssl_certificate_db:foldl(ConnectionCerts, [], CertDbHandle).
+    ssl_pkix_db:foldl(ConnectionCerts, [], CertDbHandle).
 
 
 digitally_signed({3, Minor}, Hash, HashAlgo, Key) when Minor >= 3 ->
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index caea528a08..1b06e351cf 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -104,7 +104,8 @@ connection_init(Trustedcerts, Role) ->
 %%--------------------------------------------------------------------
 cache_pem_file(File, DbHandle) ->
     MD5 = crypto:hash(md5, File),
-    case ssl_certificate_db:lookup_cached_pem(DbHandle, MD5) of
+    MD5 = crypto:md5(File),
+    case ssl_pkix_db:lookup_cached_pem(DbHandle, MD5) of
 	[{Content,_}] ->
 	    {ok, Content};
 	[Content] ->
@@ -132,7 +133,7 @@ clear_pem_cache() ->
 %% serialnumber(), issuer()}.
 %% --------------------------------------------------------------------
 lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
-    ssl_certificate_db:lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer).
+    ssl_pkix_db:lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer).
 
 %%--------------------------------------------------------------------
 -spec new_session_id(integer()) -> session_id().
@@ -194,7 +195,7 @@ init([Name, Opts]) ->
     CacheCb = proplists:get_value(session_cb, Opts, ssl_session_cache),
     SessionLifeTime =  
 	proplists:get_value(session_lifetime, Opts, ?'24H_in_sec'),
-    CertDb = ssl_certificate_db:create(),
+    CertDb = ssl_pkix_db:create(),
     SessionCache = CacheCb:init(proplists:get_value(session_cb_init_args, Opts, [])),
     Timer = erlang:send_after(SessionLifeTime * 1000 + 5000, 
 			      self(), validate_sessions),
@@ -227,7 +228,7 @@ handle_call({{connection_init, Trustedcerts, _Role}, Pid}, _From,
 		   session_cache = Cache} = State) ->
     Result = 
 	try
-	    {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, Trustedcerts, Db),
+	    {ok, Ref} = ssl_pkix_db:add_trusted_certs(Pid, Trustedcerts, Db),
 	    {ok, Ref, CertDb, FileRefDb, PemChace, Cache}
 	catch
 	    _:Reason ->
@@ -244,7 +245,7 @@ handle_call({{new_session_id,Port}, _},
 
 handle_call({{cache_pem, File}, _Pid}, _,
 	    #state{certificate_db = Db} = State) ->
-    try ssl_certificate_db:cache_pem_file(File, Db) of
+    try ssl_pkix_db:cache_pem_file(File, Db) of
 	Result ->
 	    {reply, Result, State}
     catch 
@@ -252,7 +253,7 @@ handle_call({{cache_pem, File}, _Pid}, _,
 	    {reply, {error, Reason}, State}
     end;
 handle_call({unconditionally_clear_pem_cache, _},_, #state{certificate_db = [_,_,PemChace]} = State) ->
-    ssl_certificate_db:clear(PemChace),
+    ssl_pkix_db:clear(PemChace),
     {reply, ok,  State}.
 
 %%--------------------------------------------------------------------
@@ -315,11 +316,11 @@ handle_info({delayed_clean_session, Key}, #state{session_cache = Cache,
     {noreply, State};
 
 handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace]} = State) ->
-    case ssl_certificate_db:db_size(PemChace) of
+    case ssl_pkix_db:db_size(PemChace) of
 	N  when N < ?NOT_TO_BIG ->
 	    ok;
 	_ ->
-	    ssl_certificate_db:clear(PemChace)
+	    ssl_pkix_db:clear(PemChace)
     end,
     erlang:send_after(?CLEAR_PEM_CACHE, self(), clear_pem_cache),
     {noreply, State};
@@ -328,7 +329,7 @@ handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace]} = State) ->
 handle_info({clean_cert_db, Ref, File},
 	    #state{certificate_db = [CertDb,RefDb, PemCache]} = State) ->
     
-    case ssl_certificate_db:lookup(Ref, RefDb) of
+    case ssl_pkix_db:lookup(Ref, RefDb) of
 	undefined -> %% Alredy cleaned
 	    ok;
 	_ ->
@@ -357,7 +358,7 @@ terminate(_Reason, #state{certificate_db = Db,
 			  session_cache_cb = CacheCb,
 			  session_validation_timer = Timer}) ->
     erlang:cancel_timer(Timer),
-    ssl_certificate_db:remove(Db),
+    ssl_pkix_db:remove(Db),
     CacheCb:terminate(SessionCache),
     ok.
 
@@ -466,17 +467,17 @@ new_id(Port, Tries, Cache, CacheCb) ->
     end.
 
 clean_cert_db(Ref, CertDb, RefDb, PemCache, File) ->
-    case ssl_certificate_db:ref_count(Ref, RefDb, 0) of
+    case ssl_pkix_db:ref_count(Ref, RefDb, 0) of
 	0 ->	  
 	    MD5 = crypto:hash(md5, File),
-	    case ssl_certificate_db:lookup_cached_pem(PemCache, MD5) of
+	    case ssl_pkix_db:lookup_cached_pem(PemCache, MD5) of
 		[{Content, Ref}] ->
-		    ssl_certificate_db:insert(MD5, Content, PemCache);		
+		    ssl_pkix_db:insert(MD5, Content, PemCache);		
 		_ ->
 		    ok
 	    end,
-	    ssl_certificate_db:remove(Ref, RefDb),
-	    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+	    ssl_pkix_db:remove(Ref, RefDb),
+	    ssl_pkix_db:remove_trusted_certs(Ref, CertDb);
 	_ ->
 	    ok
     end.
diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_pkix_db.erl
index cdff73336e..9de50c8f26 100644
--- a/lib/ssl/src/ssl_certificate_db.erl
+++ b/lib/ssl/src/ssl_pkix_db.erl
@@ -21,7 +21,7 @@
 %% Purpose: Storage for trusted certificates 
 %%----------------------------------------------------------------------
 
--module(ssl_certificate_db).
+-module(ssl_pkix_db).
 
 -include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").