chore: actions. remove -pq

junkurihara · Dec 12, 2024 · d3adb44 · d3adb44
1 parent 69885a7
commit d3adb44
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 70 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,16 +34,6 @@ jobs:
             platform: linux/arm64
             tags-suffix: "-slim"
 
-          - target: "musl"
-            build-feature: "-slim-pq"
-            platform: linux/amd64
-            tags-suffix: "-slim-pq"
-
-          - target: "musl"
-            build-feature: "-slim-pq"
-            platform: linux/arm64
-            tags-suffix: "-slim-pq"
-
           - target: "gnu"
             build-feature: "-s2n"
             platform: linux/amd64
@@ -54,26 +44,6 @@ jobs:
             platform: linux/arm64
             tags-suffix: "-s2n"
 
-          - target: "gnu"
-            build-feature: "-pq"
-            platform: linux/amd64
-            tags-suffix: "-pq"
-
-          - target: "gnu"
-            build-feature: "-pq"
-            platform: linux/arm64
-            tags-suffix: "-pq"
-
-          - target: "gnu"
-            build-feature: "-s2n-pq"
-            platform: linux/amd64
-            tags-suffix: "-s2n-pq"
-
-          - target: "gnu"
-            build-feature: "-s2n-pq"
-            platform: linux/arm64
-            tags-suffix: "-s2n-pq"
-
           - target: "gnu"
             build-feature: "-webpki-roots"
             platform: linux/amd64

diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml
@@ -30,17 +30,6 @@ jobs:
               jqtype/rpxy:latest
               ghcr.io/junkurihara/rust-rpxy:latest
 
-          - target: "default-pq"
-            dockerfile: ./docker/Dockerfile
-            platforms: linux/amd64,linux/arm64
-            build-args: |
-              "CARGO_FEATURES=--no-default-features --features=http3-quinn,cache,rustls-backend,acme,post-quantum"
-            tags-suffix: "-pq"
-            # Aliases must be used only for release builds
-            aliases: |
-              jqtype/rpxy:pq
-              ghcr.io/junkurihara/rust-rpxy:pq
-
           - target: "default-slim"
             dockerfile: ./docker/Dockerfile-slim
             build-contexts: |
@@ -53,20 +42,6 @@ jobs:
               jqtype/rpxy:slim
               ghcr.io/junkurihara/rust-rpxy:slim
 
-          - target: "default-slim-pq"
-            dockerfile: ./docker/Dockerfile-slim
-            build-args: |
-              "CARGO_FEATURES=--no-default-features --features=http3-quinn,cache,rustls-backend,acme,post-quantum"
-            build-contexts: |
-              messense/rust-musl-cross:amd64-musl=docker-image://messense/rust-musl-cross:x86_64-musl
-              messense/rust-musl-cross:arm64-musl=docker-image://messense/rust-musl-cross:aarch64-musl
-            platforms: linux/amd64,linux/arm64
-            tags-suffix: "-slim-pq"
-            # Aliases must be used only for release builds
-            aliases: |
-              jqtype/rpxy:slim-pq
-              ghcr.io/junkurihara/rust-rpxy:slim-pq
-
           - target: "s2n"
             dockerfile: ./docker/Dockerfile
             build-args: |
@@ -79,18 +54,6 @@ jobs:
               jqtype/rpxy:s2n
               ghcr.io/junkurihara/rust-rpxy:s2n
 
-          - target: "s2n-pq"
-            dockerfile: ./docker/Dockerfile
-            build-args: |
-              "CARGO_FEATURES=--no-default-features --features=http3-s2n,cache,rustls-backend,acme,post-quantum"
-              "ADDITIONAL_DEPS=pkg-config libssl-dev cmake libclang1 gcc g++"
-            platforms: linux/amd64,linux/arm64
-            tags-suffix: "-s2n-pq"
-            # Aliases must be used only for release builds
-            aliases: |
-              jqtype/rpxy:s2n-pq
-              ghcr.io/junkurihara/rust-rpxy:s2n-pq
-
           - target: "webpki-roots"
             dockerfile: ./docker/Dockerfile
             platforms: linux/amd64,linux/arm64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # CHANGELOG
 
-## 0.9.4 or 0.10.0 (Unreleased)
+## 0.9.5 or 0.10.0 (Unreleased)
+
+## 0.9.4
+
+### Improvement
+
+- Feat: Enable the hybrid post-quantum key exchange for TLS and QUIC with `X25519MLKEM768` by default.
+- Deps and refactor
 
 ## 0.9.3
 

diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml
@@ -13,8 +13,8 @@ publish.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-# default = ["http3-quinn", "cache", "rustls-backend", "acme", "post-quantum"] # make this default in future
-default = ["http3-s2n", "cache", "rustls-backend", "acme", "post-quantum"]
+default = ["http3-quinn", "cache", "rustls-backend", "acme", "post-quantum"]
+# default = ["http3-s2n", "cache", "rustls-backend", "acme", "post-quantum"]
 http3-quinn = ["rpxy-lib/http3-quinn"]
 http3-s2n = ["rpxy-lib/http3-s2n"]
 native-tls-backend = ["rpxy-lib/native-tls-backend"]