Skip to content

Commit 29d0863

Browse files
committed
Configure reuse_sessions/secure_renegotiate after cipher suite expansion
1 parent 19e12d3 commit 29d0863

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

lib/plug/ssl.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ defmodule Plug.SSL do
174174
|> normalize_ssl_files()
175175
|> normalize_certs_keys_ssl_files()
176176
|> convert_to_charlist()
177-
|> set_secure_defaults()
178177
|> configure_managed_tls()
178+
|> set_secure_defaults()
179179
catch
180180
{:configure, message} -> {:error, message}
181181
else

test/plug/ssl_test.exs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ defmodule Plug.SSLTest do
3838

3939
test "sets cipher suite to strong" do
4040
assert {:ok, opts} = configure(key: "abcdef", cert: "ghijkl", cipher_suite: :strong)
41+
assert opts[:reuse_sessions] == nil
42+
assert opts[:secure_renegotiate] == nil
4143
assert opts[:cipher_suite] == nil
4244
assert opts[:honor_cipher_order] == true
4345
assert opts[:eccs] == [:x25519, :secp256r1, :secp384r1, :secp521r1]
@@ -52,6 +54,8 @@ defmodule Plug.SSLTest do
5254

5355
test "sets cipher suite to compatible" do
5456
assert {:ok, opts} = configure(key: "abcdef", cert: "ghijkl", cipher_suite: :compatible)
57+
assert opts[:reuse_sessions] == true
58+
assert opts[:secure_renegotiate] == true
5559
assert opts[:cipher_suite] == nil
5660
assert opts[:honor_cipher_order] == true
5761
assert opts[:eccs] == [:x25519, :secp256r1, :secp384r1, :secp521r1]

0 commit comments

Comments
 (0)