Skip to content

Commit af8534c

Browse files
josevalimjosevalim
committed
Update to Elixir v1.15
1 parent 7a7043d commit af8534c

File tree

5 files changed

+54
-51
lines changed

5 files changed

+54
-51
lines changed

‎lib/plug/ssl.ex

+22-22
Original file line numberDiff line numberDiff line change
@@ -74,31 +74,31 @@ defmodule Plug.SSL do
7474
import Plug.Conn
7575

7676
@strong_tls_ciphers [
77-
'ECDHE-RSA-AES256-GCM-SHA384',
78-
'ECDHE-ECDSA-AES256-GCM-SHA384',
79-
'ECDHE-RSA-AES128-GCM-SHA256',
80-
'ECDHE-ECDSA-AES128-GCM-SHA256',
81-
'DHE-RSA-AES256-GCM-SHA384',
82-
'DHE-RSA-AES128-GCM-SHA256'
77+
~c"ECDHE-RSA-AES256-GCM-SHA384",
78+
~c"ECDHE-ECDSA-AES256-GCM-SHA384",
79+
~c"ECDHE-RSA-AES128-GCM-SHA256",
80+
~c"ECDHE-ECDSA-AES128-GCM-SHA256",
81+
~c"DHE-RSA-AES256-GCM-SHA384",
82+
~c"DHE-RSA-AES128-GCM-SHA256"
8383
]
8484

8585
@compatible_tls_ciphers [
86-
'ECDHE-RSA-AES256-GCM-SHA384',
87-
'ECDHE-ECDSA-AES256-GCM-SHA384',
88-
'ECDHE-RSA-AES128-GCM-SHA256',
89-
'ECDHE-ECDSA-AES128-GCM-SHA256',
90-
'DHE-RSA-AES256-GCM-SHA384',
91-
'DHE-RSA-AES128-GCM-SHA256',
92-
'ECDHE-RSA-AES256-SHA384',
93-
'ECDHE-ECDSA-AES256-SHA384',
94-
'ECDHE-RSA-AES128-SHA256',
95-
'ECDHE-ECDSA-AES128-SHA256',
96-
'DHE-RSA-AES256-SHA256',
97-
'DHE-RSA-AES128-SHA256',
98-
'ECDHE-RSA-AES256-SHA',
99-
'ECDHE-ECDSA-AES256-SHA',
100-
'ECDHE-RSA-AES128-SHA',
101-
'ECDHE-ECDSA-AES128-SHA'
86+
~c"ECDHE-RSA-AES256-GCM-SHA384",
87+
~c"ECDHE-ECDSA-AES256-GCM-SHA384",
88+
~c"ECDHE-RSA-AES128-GCM-SHA256",
89+
~c"ECDHE-ECDSA-AES128-GCM-SHA256",
90+
~c"DHE-RSA-AES256-GCM-SHA384",
91+
~c"DHE-RSA-AES128-GCM-SHA256",
92+
~c"ECDHE-RSA-AES256-SHA384",
93+
~c"ECDHE-ECDSA-AES256-SHA384",
94+
~c"ECDHE-RSA-AES128-SHA256",
95+
~c"ECDHE-ECDSA-AES128-SHA256",
96+
~c"DHE-RSA-AES256-SHA256",
97+
~c"DHE-RSA-AES128-SHA256",
98+
~c"ECDHE-RSA-AES256-SHA",
99+
~c"ECDHE-ECDSA-AES256-SHA",
100+
~c"ECDHE-RSA-AES128-SHA",
101+
~c"ECDHE-ECDSA-AES128-SHA"
102102
]
103103

104104
@eccs [

‎mix.exs

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@ defmodule Plug.MixProject do
3333
# Configuration for the OTP application
3434
def application do
3535
[
36-
extra_applications: [:logger, :eex],
36+
extra_applications: extra_applications(Mix.env()),
3737
mod: {Plug.Application, []},
3838
env: [validate_header_keys_during_test: true]
3939
]
4040
end
4141

42+
defp extra_applications(:test), do: [:logger, :eex, :ssl]
43+
defp extra_applications(_), do: [:logger, :eex]
44+
4245
def deps do
4346
[
4447
{:mime, "~> 1.0 or ~> 2.0"},

‎test/plug/parsers/json_test.exs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ defmodule Plug.Parsers.JSONTest do
3434
def decode!(~s(null)) do
3535
nil
3636
end
37-
37+
3838
def decode!("[]") do
3939
[]
4040
end
4141

4242
def decode!("{_json: []}") do
43-
%{"_json" => []}
43+
%{"_json" => []}
4444
end
4545

4646
def decode!(_) do
@@ -195,7 +195,7 @@ defmodule Plug.Parsers.JSONTest do
195195
assert Plug.Exception.status(exception) == 400
196196
end
197197

198-
test "nests all json when nest_all_json is true" do
198+
test "nests all json when nest_all_json is true" do
199199
conn_object = "{_json: []}" |> json_conn() |> parse(nest_all_json: true)
200200
conn_array = "[]" |> json_conn() |> parse(nest_all_json: true)
201201
assert conn_object.params == %{"_json" => %{"_json" => []}}

‎test/plug/parsers_test.exs

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ defmodule Plug.ParsersTest do
255255
end
256256

257257
test "validates utf8 in multipart body" do
258-
latin1_binary = :unicode.characters_to_binary('hello©', :utf8, :latin1)
258+
latin1_binary = :unicode.characters_to_binary(~c"hello©", :utf8, :latin1)
259259

260260
multipart = """
261261
------w58EW1cEpjzydSCq\r
@@ -273,7 +273,7 @@ defmodule Plug.ParsersTest do
273273
end
274274

275275
test "does not validate utf8 in multipart body opt" do
276-
latin1_binary = :unicode.characters_to_binary('hello©', :utf8, :latin1)
276+
latin1_binary = :unicode.characters_to_binary(~c"hello©", :utf8, :latin1)
277277

278278
multipart = """
279279
------w58EW1cEpjzydSCq\r

‎test/plug/ssl_test.exs

+23-23
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ defmodule Plug.SSLTest do
3232
assert opts[:versions] == [:"tlsv1.2"]
3333

3434
assert opts[:ciphers] == [
35-
'ECDHE-RSA-AES256-GCM-SHA384',
36-
'ECDHE-ECDSA-AES256-GCM-SHA384',
37-
'ECDHE-RSA-AES128-GCM-SHA256',
38-
'ECDHE-ECDSA-AES128-GCM-SHA256',
39-
'DHE-RSA-AES256-GCM-SHA384',
40-
'DHE-RSA-AES128-GCM-SHA256'
35+
~c"ECDHE-RSA-AES256-GCM-SHA384",
36+
~c"ECDHE-ECDSA-AES256-GCM-SHA384",
37+
~c"ECDHE-RSA-AES128-GCM-SHA256",
38+
~c"ECDHE-ECDSA-AES128-GCM-SHA256",
39+
~c"DHE-RSA-AES256-GCM-SHA384",
40+
~c"DHE-RSA-AES128-GCM-SHA256"
4141
]
4242
end
4343

@@ -49,22 +49,22 @@ defmodule Plug.SSLTest do
4949
assert opts[:versions] == [:"tlsv1.2", :"tlsv1.1", :tlsv1]
5050

5151
assert opts[:ciphers] == [
52-
'ECDHE-RSA-AES256-GCM-SHA384',
53-
'ECDHE-ECDSA-AES256-GCM-SHA384',
54-
'ECDHE-RSA-AES128-GCM-SHA256',
55-
'ECDHE-ECDSA-AES128-GCM-SHA256',
56-
'DHE-RSA-AES256-GCM-SHA384',
57-
'DHE-RSA-AES128-GCM-SHA256',
58-
'ECDHE-RSA-AES256-SHA384',
59-
'ECDHE-ECDSA-AES256-SHA384',
60-
'ECDHE-RSA-AES128-SHA256',
61-
'ECDHE-ECDSA-AES128-SHA256',
62-
'DHE-RSA-AES256-SHA256',
63-
'DHE-RSA-AES128-SHA256',
64-
'ECDHE-RSA-AES256-SHA',
65-
'ECDHE-ECDSA-AES256-SHA',
66-
'ECDHE-RSA-AES128-SHA',
67-
'ECDHE-ECDSA-AES128-SHA'
52+
~c"ECDHE-RSA-AES256-GCM-SHA384",
53+
~c"ECDHE-ECDSA-AES256-GCM-SHA384",
54+
~c"ECDHE-RSA-AES128-GCM-SHA256",
55+
~c"ECDHE-ECDSA-AES128-GCM-SHA256",
56+
~c"DHE-RSA-AES256-GCM-SHA384",
57+
~c"DHE-RSA-AES128-GCM-SHA256",
58+
~c"ECDHE-RSA-AES256-SHA384",
59+
~c"ECDHE-ECDSA-AES256-SHA384",
60+
~c"ECDHE-RSA-AES128-SHA256",
61+
~c"ECDHE-ECDSA-AES128-SHA256",
62+
~c"DHE-RSA-AES256-SHA256",
63+
~c"DHE-RSA-AES128-SHA256",
64+
~c"ECDHE-RSA-AES256-SHA",
65+
~c"ECDHE-ECDSA-AES256-SHA",
66+
~c"ECDHE-RSA-AES128-SHA",
67+
~c"ECDHE-ECDSA-AES128-SHA"
6868
]
6969
end
7070

@@ -99,7 +99,7 @@ defmodule Plug.SSLTest do
9999
configure(
100100
key: "abcdef",
101101
cert: "ghijkl",
102-
ciphers: ['ECDHE-ECDSA-AES256-GCM-SHA384', "ECDHE-RSA-AES256-GCM-SHA384"]
102+
ciphers: [~c"ECDHE-ECDSA-AES256-GCM-SHA384", "ECDHE-RSA-AES256-GCM-SHA384"]
103103
)
104104

105105
assert message ==

0 commit comments

Comments
 (0)