diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:05:27 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:05:27 +0100 |
| commit | aff5d7501af8081faeb2b6ead963c680765852f3 (patch) | |
| tree | 23f18d2f2d2e03527a1c3b347518b8fbe2914169 /lib/ssl/src/ssl_config.erl | |
| parent | 8e16234a480d5b5e24a9724c9c8871604fd80627 (diff) | |
| parent | c2a833811c768fc38b51a5241f55eb25786ac13e (diff) | |
| download | otp-aff5d7501af8081faeb2b6ead963c680765852f3.tar.gz otp-aff5d7501af8081faeb2b6ead963c680765852f3.tar.bz2 otp-aff5d7501af8081faeb2b6ead963c680765852f3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_config.erl')
| -rw-r--r-- | lib/ssl/src/ssl_config.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl index 0652d029c3..54f83928ee 100644 --- a/lib/ssl/src/ssl_config.erl +++ b/lib/ssl/src/ssl_config.erl @@ -41,9 +41,11 @@ init(SslOpts, Role) -> {ok, CertDbRef, CertDbHandle, FileRefHandle, CacheHandle, CRLDbHandle, OwnCert, PrivateKey, DHParams}. init_manager_name(false) -> - put(ssl_manager, ssl_manager:manager_name(normal)); + put(ssl_manager, ssl_manager:name(normal)), + put(ssl_cache, ssl_pem_cache:name(normal)); init_manager_name(true) -> - put(ssl_manager, ssl_manager:manager_name(dist)). + put(ssl_manager, ssl_manager:name(dist)), + put(ssl_cache, ssl_pem_cache:name(dist)). init_certificates(#ssl_options{cacerts = CaCerts, cacertfile = CACertFile, @@ -135,6 +137,8 @@ file_error(File, Throw) -> case Throw of {Opt,{badmatch, {error, {badmatch, Error}}}} -> throw({options, {Opt, binary_to_list(File), Error}}); + {Opt, {badmatch, Error}} -> + throw({options, {Opt, binary_to_list(File), Error}}); _ -> throw(Throw) end. |