diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-04 16:13:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-15 15:47:38 +0200 |
| commit | b2c0bef3cff85784b2ccb3b91bbea997acab6187 (patch) | |
| tree | b278321f59e2169f0e3400018372bfdfb246c24e /lib/ssl/src | |
| parent | 0d2bebf94d99b2d3bd39c5731ac81122f3ea7fb7 (diff) | |
| download | otp-b2c0bef3cff85784b2ccb3b91bbea997acab6187.tar.gz otp-b2c0bef3cff85784b2ccb3b91bbea997acab6187.tar.bz2 otp-b2c0bef3cff85784b2ccb3b91bbea997acab6187.zip | |
ssl: Correct return value of default session callback module
ssl_session_cache:select_session/2 returned [sesionid(), #session{}]
instead of #session{} as the API demands.
This was wrongly compensated for in the code in one place making it
look like everything was good. But the client check for unique session
would always fail, potentially making the client session table grow
a lot and causing long setup times.
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_session.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_session_cache.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl index 1770faf1ff..0d6cc93a20 100644 --- a/lib/ssl/src/ssl_session.erl +++ b/lib/ssl/src/ssl_session.erl @@ -100,14 +100,14 @@ select_session([], _, _) -> no_session; select_session(Sessions, #ssl_options{ciphers = Ciphers}, OwnCert) -> IsNotResumable = - fun([_Id, Session]) -> + fun(Session) -> not (resumable(Session#session.is_resumable) andalso lists:member(Session#session.cipher_suite, Ciphers) andalso (OwnCert == Session#session.own_certificate)) end, case lists:dropwhile(IsNotResumable, Sessions) of [] -> no_session; - [[Id, _]|_] -> Id + [Session | _] -> Session#session.session_id end. is_resumable(_, _, #ssl_options{reuse_sessions = false}, _, _, _, _) -> diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl index 11ed310477..cfc48cd935 100644 --- a/lib/ssl/src/ssl_session_cache.erl +++ b/lib/ssl/src/ssl_session_cache.erl @@ -83,7 +83,7 @@ foldl(Fun, Acc0, Cache) -> %%-------------------------------------------------------------------- select_session(Cache, PartialKey) -> ets:select(Cache, - [{{{PartialKey,'$1'}, '$2'},[],['$$']}]). + [{{{PartialKey,'_'}, '$1'},[],['$1']}]). %%-------------------------------------------------------------------- %%% Internal functions |