diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-11 09:53:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-04 16:42:29 +0200 |
| commit | 036a9c4edd013b8a97e5075e3da10b68698d2916 (patch) | |
| tree | a0f9eb98326af3114584c65d38b4fd57e9ec519f /lib/ssl/src/ssl_connection.erl | |
| parent | f7f24a77e918eea712b435a5ae9b01de270d6d7d (diff) | |
| download | otp-036a9c4edd013b8a97e5075e3da10b68698d2916.tar.gz otp-036a9c4edd013b8a97e5075e3da10b68698d2916.tar.bz2 otp-036a9c4edd013b8a97e5075e3da10b68698d2916.zip | |
ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity
Conflicts:
lib/ssl/src/ssl.app.src
lib/ssl/src/ssl_manager.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
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); _ -> |