From b95aaffe538406141255fc0e4f0b6edf4f6d1970 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Tue, 3 Jun 2025 16:14:04 +0200 Subject: [PATCH 1/2] build!: rename to -repaired suffix --- Cargo.toml | 2 +- {jsonwebkey-cli => jsonwebkey-cli-repaired}/Cargo.toml | 8 ++++---- {jsonwebkey-cli => jsonwebkey-cli-repaired}/README.md | 0 {jsonwebkey-cli => jsonwebkey-cli-repaired}/src/main.rs | 0 .../Cargo.toml | 6 +++--- .../README.md | 0 .../src/der.rs | 0 .../src/jwt.rs | 0 .../src/lib.rs | 0 .../testfiles/example-private-key.json | 0 .../testfiles/example-public-key.json | 0 .../testfiles/example-symmetric-keys.json | 0 .../testfiles/test1.json | 0 .../testfiles/test1.pem | 0 .../testfiles/test2.json | 0 .../testfiles/test2.pem | 0 16 files changed, 8 insertions(+), 8 deletions(-) rename {jsonwebkey-cli => jsonwebkey-cli-repaired}/Cargo.toml (74%) rename {jsonwebkey-cli => jsonwebkey-cli-repaired}/README.md (100%) rename {jsonwebkey-cli => jsonwebkey-cli-repaired}/src/main.rs (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/Cargo.toml (90%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/README.md (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/src/der.rs (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/src/jwt.rs (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/src/lib.rs (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/example-private-key.json (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/example-public-key.json (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/example-symmetric-keys.json (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/test1.json (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/test1.pem (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/test2.json (100%) rename {jsonwebkey-convert => jsonwebkey-convert-repaired}/testfiles/test2.pem (100%) diff --git a/Cargo.toml b/Cargo.toml index eb64add..8a90439 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["jsonwebkey-convert", "jsonwebkey-cli"] +members = ["jsonwebkey-convert-repaired", "jsonwebkey-cli-repaired"] diff --git a/jsonwebkey-cli/Cargo.toml b/jsonwebkey-cli-repaired/Cargo.toml similarity index 74% rename from jsonwebkey-cli/Cargo.toml rename to jsonwebkey-cli-repaired/Cargo.toml index 68acb8b..0a36752 100644 --- a/jsonwebkey-cli/Cargo.toml +++ b/jsonwebkey-cli-repaired/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "jsonwebkey-cli" -version = "0.3.0" +name = "jsonwebkey-cli-repaired" +version = "0.3.1" authors = ["Okamura Yasunobu "] edition = "2018" license = "Apache-2.0" @@ -14,6 +14,6 @@ categories = ["authentication"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -jsonwebkey-convert = {version = "0.3", path = "../jsonwebkey-convert", features = ["pem_support"]} +jsonwebkey-convert-repaired = {version = "0.3.1", path = "../jsonwebkey-convert-repaired", features = ["pem_support"]} clap = "2" -serde_json = "1" \ No newline at end of file +serde_json = "1" diff --git a/jsonwebkey-cli/README.md b/jsonwebkey-cli-repaired/README.md similarity index 100% rename from jsonwebkey-cli/README.md rename to jsonwebkey-cli-repaired/README.md diff --git a/jsonwebkey-cli/src/main.rs b/jsonwebkey-cli-repaired/src/main.rs similarity index 100% rename from jsonwebkey-cli/src/main.rs rename to jsonwebkey-cli-repaired/src/main.rs diff --git a/jsonwebkey-convert/Cargo.toml b/jsonwebkey-convert-repaired/Cargo.toml similarity index 90% rename from jsonwebkey-convert/Cargo.toml rename to jsonwebkey-convert-repaired/Cargo.toml index c7f6076..5435844 100644 --- a/jsonwebkey-convert/Cargo.toml +++ b/jsonwebkey-convert-repaired/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "jsonwebkey-convert" -version = "0.3.0" +name = "jsonwebkey-convert-repaired" +version = "0.3.1" authors = ["Okamura Yasunobu "] edition = "2018" license = "Apache-2.0" -description = "Convert an RSA public key between Json Web Key and DER/PEM format." +description = "Convert an RSA public key between Json Web Key and DER/PEM format (dependencies repaired)." readme = "README.md" homepage = "https://github.com/informationsea/jsonwebkey-rs" repository = "https://github.com/informationsea/jsonwebkey-rs" diff --git a/jsonwebkey-convert/README.md b/jsonwebkey-convert-repaired/README.md similarity index 100% rename from jsonwebkey-convert/README.md rename to jsonwebkey-convert-repaired/README.md diff --git a/jsonwebkey-convert/src/der.rs b/jsonwebkey-convert-repaired/src/der.rs similarity index 100% rename from jsonwebkey-convert/src/der.rs rename to jsonwebkey-convert-repaired/src/der.rs diff --git a/jsonwebkey-convert/src/jwt.rs b/jsonwebkey-convert-repaired/src/jwt.rs similarity index 100% rename from jsonwebkey-convert/src/jwt.rs rename to jsonwebkey-convert-repaired/src/jwt.rs diff --git a/jsonwebkey-convert/src/lib.rs b/jsonwebkey-convert-repaired/src/lib.rs similarity index 100% rename from jsonwebkey-convert/src/lib.rs rename to jsonwebkey-convert-repaired/src/lib.rs diff --git a/jsonwebkey-convert/testfiles/example-private-key.json b/jsonwebkey-convert-repaired/testfiles/example-private-key.json similarity index 100% rename from jsonwebkey-convert/testfiles/example-private-key.json rename to jsonwebkey-convert-repaired/testfiles/example-private-key.json diff --git a/jsonwebkey-convert/testfiles/example-public-key.json b/jsonwebkey-convert-repaired/testfiles/example-public-key.json similarity index 100% rename from jsonwebkey-convert/testfiles/example-public-key.json rename to jsonwebkey-convert-repaired/testfiles/example-public-key.json diff --git a/jsonwebkey-convert/testfiles/example-symmetric-keys.json b/jsonwebkey-convert-repaired/testfiles/example-symmetric-keys.json similarity index 100% rename from jsonwebkey-convert/testfiles/example-symmetric-keys.json rename to jsonwebkey-convert-repaired/testfiles/example-symmetric-keys.json diff --git a/jsonwebkey-convert/testfiles/test1.json b/jsonwebkey-convert-repaired/testfiles/test1.json similarity index 100% rename from jsonwebkey-convert/testfiles/test1.json rename to jsonwebkey-convert-repaired/testfiles/test1.json diff --git a/jsonwebkey-convert/testfiles/test1.pem b/jsonwebkey-convert-repaired/testfiles/test1.pem similarity index 100% rename from jsonwebkey-convert/testfiles/test1.pem rename to jsonwebkey-convert-repaired/testfiles/test1.pem diff --git a/jsonwebkey-convert/testfiles/test2.json b/jsonwebkey-convert-repaired/testfiles/test2.json similarity index 100% rename from jsonwebkey-convert/testfiles/test2.json rename to jsonwebkey-convert-repaired/testfiles/test2.json diff --git a/jsonwebkey-convert/testfiles/test2.pem b/jsonwebkey-convert-repaired/testfiles/test2.pem similarity index 100% rename from jsonwebkey-convert/testfiles/test2.pem rename to jsonwebkey-convert-repaired/testfiles/test2.pem From cbb6688a453a94c186df149ffcc9d7810983d4ad Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Tue, 3 Jun 2025 16:14:40 +0200 Subject: [PATCH 2/2] build!(deps): upgrade bigint lib to solve issue downstream --- jsonwebkey-convert-repaired/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonwebkey-convert-repaired/Cargo.toml b/jsonwebkey-convert-repaired/Cargo.toml index 5435844..483b658 100644 --- a/jsonwebkey-convert-repaired/Cargo.toml +++ b/jsonwebkey-convert-repaired/Cargo.toml @@ -22,7 +22,7 @@ pem_support = ["simple_asn1", "pem"] pem = { version = "0.8", optional = true } jsonwebtoken = { version = "^7.2", optional = true } simple_asn1 = { version = "^0.5.1", optional = true } -num-bigint = "^0.3" +num-bigint = "^0.4" serde = { version = "1", features = ["derive"] } serde_json = "1" base64 = "^0.13"