aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_config.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-01-31 16:57:57 +0100
committerIngela Anderton Andin <[email protected]>2017-02-01 12:22:34 +0100
commit2db05402f6b81e312ea268dd56483d0b3ca15941 (patch)
tree0ce48bfc8f96766dbd2a51fd14df8244e3a96d44 /lib/ssl/src/ssl_config.erl
parent21d21786abdaae2ae0a601baf5102412399d7af6 (diff)
downloadotp-2db05402f6b81e312ea268dd56483d0b3ca15941.tar.gz
otp-2db05402f6b81e312ea268dd56483d0b3ca15941.tar.bz2
otp-2db05402f6b81e312ea268dd56483d0b3ca15941.zip
ssl: Make sure PEM cache works as intended
Move of PEM cache to own process was flawed and not all PEM files where cached properly. We must properly handle both the ditributed and the normal mode of the ssl application.
Diffstat (limited to 'lib/ssl/src/ssl_config.erl')
-rw-r--r--lib/ssl/src/ssl_config.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
index 54f83928ee..4926a146fe 100644
--- a/lib/ssl/src/ssl_config.erl
+++ b/lib/ssl/src/ssl_config.erl
@@ -42,10 +42,10 @@ init(SslOpts, Role) ->
init_manager_name(false) ->
put(ssl_manager, ssl_manager:name(normal)),
- put(ssl_cache, ssl_pem_cache:name(normal));
+ put(ssl_pem_cache, ssl_pem_cache:name(normal));
init_manager_name(true) ->
put(ssl_manager, ssl_manager:name(dist)),
- put(ssl_cache, ssl_pem_cache:name(dist)).
+ put(ssl_pem_cache, ssl_pem_cache:name(dist)).
init_certificates(#ssl_options{cacerts = CaCerts,
cacertfile = CACertFile,