Skip to content

Commit

Permalink
Use :public_key.cacerts_get, closes #6066 (#6067)
Browse files Browse the repository at this point in the history
* Use :public_key.cacerts_get, closes #6066

* Bump OTP
  • Loading branch information
josevalim authored Feb 17, 2025
1 parent 577004e commit faf58d0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
include:
- elixir: 1.15.8
otp: 24.3.4.17
otp: 25.3.2.9

- elixir: 1.17.3
otp: 27.2
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
include:
# look for correct alpine image here: https://hub.docker.com/r/hexpm/elixir/tags
- elixir: 1.15.8
otp: 24.3.4.17
otp: 25.3.2.9
suffix: "alpine-3.20.3"

- elixir: 1.17.3
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog for v1.8

This release requires Erlang/OTP 25+.

## v1.7

The CHANGELOG for v1.7 releases can be found in the [v1.7 branch](https://github.com/phoenixframework/phoenix/blob/v1.7/CHANGELOG.md).
2 changes: 1 addition & 1 deletion lib/mix/tasks/phx.gen.release.ex
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ defmodule Mix.Tasks.Phx.Gen.Release do
http_options = [
ssl: [
verify: :verify_peer,
cacertfile: String.to_charlist(CAStore.file_path()),
cacerts: :public_key.cacerts_get(),
depth: 3,
customize_hostname_check: [
match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
Expand Down
2 changes: 0 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ defmodule Phoenix.MixProject do

# TODO Drop phoenix_view as an optional dependency in Phoenix v2.0
{:phoenix_view, "~> 2.0", optional: true},
# TODO Drop castore when we require OTP 25+ / Elixir v1.17+
{:castore, ">= 0.0.0"},

# Optional deps
{:plug_cowboy, "~> 2.7", optional: true},
Expand Down

0 comments on commit faf58d0

Please sign in to comment.