Prepare for 1.11.6 release

potatosalad · Jul 18, 2023 · 7f35a15 · 7f35a15
1 parent fb7547c
commit 7f35a15
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 41 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,10 +14,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - elixir: 1.14.2
-            otp: 25.2
+          - elixir: 1.15.4
+            otp: 26.0.2
             lint: true
 
+          - elixir: 1.14.5
+            otp: 25.2
+
           - elixir: 1.13.4
             otp: 24.3.4.5
 

diff --git a/Makefile b/Makefile
@@ -1,24 +1,24 @@
 PROJECT = jose
 PROJECT_DESCRIPTION = JSON Object Signing and Encryption (JOSE) for Erlang and Elixir.
-PROJECT_VERSION = 1.11.5
+PROJECT_VERSION = 1.11.6
 
 TEST_DEPS = jiffy jsone jsx libdecaf libsodium ojson proper thoas
 
 dep_jiffy = hex 1.1.1
-dep_jsone = hex 1.7.0
+dep_jsone = hex 1.8.0
 dep_jsx = hex 3.1.0
 # dep_keccakf1600 = hex 3.0.0
 dep_libdecaf = hex 2.1.1
 dep_libsodium = hex 2.0.1
 dep_ojson = hex 1.0.0
-dep_thoas = hex 0.4.0
-dep_proper = git https://github.com/proper-testing/proper.git bfd7d862dd5082eeca65c192a7021d0e4de5973e
+dep_thoas = hex 1.0.0
+dep_proper = git https://github.com/proper-testing/proper.git def84f172df92635cc62f3356e3e7ad054638eb4
 
 include erlang.mk
 
 .PHONY: docker-build docker-load docker-setup docker-save docker-shell docker-test docker-test-build
 
-DOCKER_OTP_VERSION ?= 25.0.4-alpine-3.16.1
+DOCKER_OTP_VERSION ?= 26.0.2-alpine-3.18.2
 CT_SUITES ?=
 
 docker-build::

diff --git a/mix.exs b/mix.exs
@@ -28,16 +28,16 @@ defmodule JOSE.Mixfile do
   defp deps() do
     [
       # {:cutkey, github: "potatosalad/cutkey", only: [:dev, :test]},
-      {:jason, "~> 1.3", only: [:dev, :test]},
-      {:jsone, "~> 1.7", only: [:dev, :test]},
+      {:jason, "~> 1.4", only: [:dev, :test]},
+      {:jsone, "~> 1.8", only: [:dev, :test]},
       {:jsx, "~> 3.1", only: [:dev, :test]},
       # {:keccakf1600, "~> 2.0.0", only: [:dev, :test]},
       {:libdecaf, "~> 2.1.1", only: [:dev, :test]},
       {:libsodium, "~> 2.0.1", only: [:dev, :test]},
       {:ojson, "~> 1.0", only: [:dev, :test]},
       {:poison, "~> 5.0", only: [:dev, :test]},
-      {:thoas, "~> 0.4", only: [:dev, :test]},
-      {:ex_doc, "~> 0.28", only: :dev},
+      {:thoas, "~> 1.0", only: [:dev, :test]},
+      {:ex_doc, "~> 0.30", only: :dev},
       {:earmark, "~> 1.4", only: :dev}
     ]
   end

diff --git a/priv/.keep b/priv/.keep
diff --git a/priv/Dockerfile b/priv/Dockerfile
diff --git a/src/jose.app.src b/src/jose.app.src
@@ -2,7 +2,7 @@
 %% vim: ts=4 sw=4 ft=erlang noet
 {application, jose, [
 	{description, "JSON Object Signing and Encryption (JOSE) for Erlang and Elixir."},
-	{vsn, "1.11.5"},
+	{vsn, "1.11.6"},
 	{id, "git"},
 	{mod, {'jose_app', []}},
 	{registered, []},

diff --git a/src/jwa/jose_jwa.erl b/src/jwa/jose_jwa.erl
@@ -294,6 +294,15 @@ supports() ->
 		<<"ECDH-ES+A256KW">>,
 		{<<"ECDH-ES+C20PKW">>, ciphers, {chacha20_poly1305, 256}},
 		{<<"ECDH-ES+XC20PKW">>, ciphers, {xchacha20_poly1305, 256}},
+		<<"ECDH-SS">>,
+		{<<"ECDH-SS+A128GCMKW">>, ciphers, {aes_gcm, 128}},
+		{<<"ECDH-SS+A192GCMKW">>, ciphers, {aes_gcm, 192}},
+		{<<"ECDH-SS+A256GCMKW">>, ciphers, {aes_gcm, 256}},
+		<<"ECDH-SS+A128KW">>,
+		<<"ECDH-SS+A192KW">>,
+		<<"ECDH-SS+A256KW">>,
+		{<<"ECDH-SS+C20PKW">>, ciphers, {chacha20_poly1305, 256}},
+		{<<"ECDH-SS+XC20PKW">>, ciphers, {xchacha20_poly1305, 256}},
 		{<<"PBES2-HS256+A128GCMKW">>, ciphers, {aes_gcm, 128}},
 		{<<"PBES2-HS384+A192GCMKW">>, ciphers, {aes_gcm, 192}},
 		{<<"PBES2-HS512+A256GCMKW">>, ciphers, {aes_gcm, 256}},
@@ -340,7 +349,9 @@ supports() ->
 		{<<"Ed25519ph">>, public_keys, ed25519ph},
 		{<<"Ed448">>, public_keys, ed448},
 		{<<"Ed448ph">>, public_keys, ed448ph},
+		{<<"EdDSA">>, public_keys, ed25519},
 		{<<"ES256">>, public_keys, ecdsa},
+		{<<"ES256K">>, public_keys, ecdsa},
 		{<<"ES384">>, public_keys, ecdsa},
 		{<<"ES512">>, public_keys, ecdsa},
 		<<"HS256">>,
@@ -350,6 +361,7 @@ supports() ->
 		{<<"PS384">>, rsa_sign, rsa_pkcs1_pss_padding},
 		{<<"PS512">>, rsa_sign, rsa_pkcs1_pss_padding},
 		{<<"Poly1305">>, hashs, poly1305},
+		{<<"RS1">>, rsa_sign, rsa_pkcs1_padding},
 		{<<"RS256">>, rsa_sign, rsa_pkcs1_padding},
 		{<<"RS384">>, rsa_sign, rsa_pkcs1_padding},
 		{<<"RS512">>, rsa_sign, rsa_pkcs1_padding},

diff --git a/test/Dockerfile b/test/Dockerfile
@@ -7,8 +7,7 @@ ENV LANG=C.UTF-8 TERM=xterm
 # Add dependencies
 RUN apk upgrade --update musl && \
     apk add --no-cache autoconf automake bash bc build-base cmake curl git libtool make openssl python3 rsync unzip && \
-    rm -rf /var/cache/apk/* && \
-    ln -s /usr/bin/python3 /usr/bin/python
+    rm -rf /var/cache/apk/*
 
 RUN mkdir /build
 WORKDIR /build