diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-09-13 08:39:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-09-13 08:39:10 +0200 |
| commit | dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a (patch) | |
| tree | cdcf094e88ebc2d2ec8b1cc66e807be3886036b2 | |
| parent | dcb66b30a2115e2a57436d800ed41880e5be633e (diff) | |
| parent | 66e0aa61b84db86d52f081278c571852b3c90a62 (diff) | |
| download | otp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.tar.gz otp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.tar.bz2 otp-dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a.zip | |
Merge branch 'ingela/ssl/pem-dist/ERL-483' into maint
* ingela/ssl/pem-dist/ERL-483:
ssl: Do not break abstraction
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_pem_cache.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_pkix_db.erl | 15 |
3 files changed, 13 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index ef7c3de7af..f44fe6a2bf 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -78,7 +78,7 @@ name(normal) -> ?MODULE; name(dist) -> - list_to_atom(atom_to_list(?MODULE) ++ "dist"). + list_to_atom(atom_to_list(?MODULE) ++ "_dist"). %%-------------------------------------------------------------------- -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}. diff --git a/lib/ssl/src/ssl_pem_cache.erl b/lib/ssl/src/ssl_pem_cache.erl index 6cc0729208..115ab4451d 100644 --- a/lib/ssl/src/ssl_pem_cache.erl +++ b/lib/ssl/src/ssl_pem_cache.erl @@ -65,7 +65,7 @@ name(normal) -> ?MODULE; name(dist) -> - list_to_atom(atom_to_list(?MODULE) ++ "dist"). + list_to_atom(atom_to_list(?MODULE) ++ "_dist"). %%-------------------------------------------------------------------- -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}. diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl index b28636569d..8828c3a0d8 100644 --- a/lib/ssl/src/ssl_pkix_db.erl +++ b/lib/ssl/src/ssl_pkix_db.erl @@ -76,10 +76,17 @@ remove(Dbs) -> true = ets:delete(Db1); (undefined) -> ok; - (ssl_pem_cache) -> - ok; - (ssl_pem_cache_dist) -> - ok; + (Name) when is_atom(Name) -> + NormalName = ssl_pem_cache:name(normal), + DistName = ssl_pem_cache:name(dist), + case Name of + NormalName -> + ok; + DistName -> + ok; + _ -> + true = ets:delete(Name) + end; (Db) -> true = ets:delete(Db) end, Dbs). |