add ecdsa support for native client

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - drop support for Elixir < v1.16
 - [allow](https://github.com/sasa1977/site_encrypt/pull/63) all `Logger.levels()` in `:log_level` option
+- [support](https://github.com/sasa1977/site_encrypt/pull/69) ECDSA in the native ACME client
+- [default](https://github.com/sasa1977/site_encrypt/pull/69) to ECDSA in the native ACME client
 
 ## 0.6.0
 

lib/site_encrypt.ex

@@ -20,7 +20,9 @@ defmodule SiteEncrypt do
           client: :native | :certbot,
           backup: String.t() | nil,
           callback: module,
+          key_type: :rsa | :ecdsa,
           key_size: pos_integer,
+          elliptic_curve: String.t(),
           periodic_offset: Certification.Periodic.offset()
         }
 
@@ -118,10 +120,25 @@ defmodule SiteEncrypt do
       default: :info,
       doc: "Logger level for info messages."
     ],
+    key_type: [
+      type: {:in, [:rsa, :ecdsa]},
+      default: :ecdsa,
+      doc: """
+      Specifies the algorithm to be used for the key.
+
+      - `:rsa` - Use RSA algorithm for key generation. This option is widely supported and ensures compatibility with a broad range of clients and servers.
+      - `:ecdsa` - Use ECDSA for key generation. This option provides better performance and security with smaller key sizes compared to RSA. This is the default option.
+      """
+    ],
     key_size: [
       type: :pos_integer,
       default: 4096,
-      doc: "The size used for generating private keys."
+      doc: "The size used for generating private RSA keys."
+    ],
+    elliptic_curve: [
+      type: {:in, ["P-256", "P-384"]},
+      default: "P-256",
+      doc: "The curve used for generating private ECDSA keys."
     ],
     mode: [
       type: {:in, [:auto, :manual]},

lib/site_encrypt/acme/client.ex

@@ -16,7 +16,7 @@ defmodule SiteEncrypt.Acme.Client do
   @spec new_account(SiteEncrypt.id(), API.session_opts()) :: API.session()
   def new_account(id, session_opts \\ []) do
     config = SiteEncrypt.Registry.config(id)
-    account_key = JOSE.JWK.generate_key({:rsa, config.key_size})
+    account_key = generate_key(config)
     session = start_session(SiteEncrypt.directory_url(config), account_key, session_opts)
     {:ok, session} = API.new_account(session, config.emails)
     session
@@ -47,6 +47,14 @@ defmodule SiteEncrypt.Acme.Client do
     {%{privkey: Crypto.private_key_to_pem(private_key), cert: cert, chain: chain}, session}
   end
 
+  defp generate_key(%{key_type: :rsa, key_size: key_size}) do
+    JOSE.JWK.generate_key({:rsa, key_size})
+  end
+
+  defp generate_key(%{key_type: :ecdsa, elliptic_curve: curve}) do
+    JOSE.JWK.generate_key({:ec, curve})
+  end
+
   defp start_session(directory_url, account_key, session_opts) do
     {:ok, session} = API.new_session(directory_url, account_key, session_opts)
     session

lib/site_encrypt/acme/client/api.ex

@@ -253,7 +253,7 @@ defmodule SiteEncrypt.Acme.Client.API do
   defp jws_body(session, url, id_field, payload) do
     protected =
       Map.merge(
-        %{"alg" => "RS256", "nonce" => session.nonce, "url" => url},
+        %{"alg" => jwk_to_alg(session.account_key), "nonce" => session.nonce, "url" => url},
         id_map(id_field, session)
       )
 
@@ -269,6 +269,16 @@ defmodule SiteEncrypt.Acme.Client.API do
 
   defp id_map(:kid, session), do: %{"kid" => session.kid}
 
+  defp jwk_to_alg(jwk) do
+    {_modules, public_map} = JOSE.JWK.to_public_map(jwk)
+
+    case public_map do
+      %{"kty" => "RSA"} -> "RS256"
+      %{"kty" => "EC", "crv" => "P-256"} -> "ES256"
+      %{"kty" => "EC", "crv" => "P-384"} -> "ES384"
+    end
+  end
+
   defp http_request(session, verb, url, opts \\ []) do
     opts =
       opts

test/pebble_test.exs

@@ -1,5 +1,5 @@
 defmodule SiteEncrypt.PebbleTest do
-  use ExUnit.Case, async: true
+  use ExUnit.Case, async: false
   import SiteEncrypt.Phoenix.Test
   alias __MODULE__.TestEndpoint