diff --git a/Cargo.toml b/Cargo.toml index 8a90439..eb64add 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["jsonwebkey-convert-repaired", "jsonwebkey-cli-repaired"] +members = ["jsonwebkey-convert", "jsonwebkey-cli"] diff --git a/jsonwebkey-cli-repaired/Cargo.toml b/jsonwebkey-cli/Cargo.toml similarity index 74% rename from jsonwebkey-cli-repaired/Cargo.toml rename to jsonwebkey-cli/Cargo.toml index 0a36752..68acb8b 100644 --- a/jsonwebkey-cli-repaired/Cargo.toml +++ b/jsonwebkey-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "jsonwebkey-cli-repaired" -version = "0.3.1" +name = "jsonwebkey-cli" +version = "0.3.0" 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-repaired = {version = "0.3.1", path = "../jsonwebkey-convert-repaired", features = ["pem_support"]} +jsonwebkey-convert = {version = "0.3", path = "../jsonwebkey-convert", features = ["pem_support"]} clap = "2" -serde_json = "1" +serde_json = "1" \ No newline at end of file diff --git a/jsonwebkey-cli-repaired/README.md b/jsonwebkey-cli/README.md similarity index 100% rename from jsonwebkey-cli-repaired/README.md rename to jsonwebkey-cli/README.md diff --git a/jsonwebkey-cli-repaired/src/main.rs b/jsonwebkey-cli/src/main.rs similarity index 100% rename from jsonwebkey-cli-repaired/src/main.rs rename to jsonwebkey-cli/src/main.rs diff --git a/jsonwebkey-convert-repaired/Cargo.toml b/jsonwebkey-convert/Cargo.toml similarity index 88% rename from jsonwebkey-convert-repaired/Cargo.toml rename to jsonwebkey-convert/Cargo.toml index 483b658..c7f6076 100644 --- a/jsonwebkey-convert-repaired/Cargo.toml +++ b/jsonwebkey-convert/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "jsonwebkey-convert-repaired" -version = "0.3.1" +name = "jsonwebkey-convert" +version = "0.3.0" authors = ["Okamura Yasunobu "] edition = "2018" license = "Apache-2.0" -description = "Convert an RSA public key between Json Web Key and DER/PEM format (dependencies repaired)." +description = "Convert an RSA public key between Json Web Key and DER/PEM format." readme = "README.md" homepage = "https://github.com/informationsea/jsonwebkey-rs" repository = "https://github.com/informationsea/jsonwebkey-rs" @@ -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.4" +num-bigint = "^0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" base64 = "^0.13" diff --git a/jsonwebkey-convert-repaired/README.md b/jsonwebkey-convert/README.md similarity index 100% rename from jsonwebkey-convert-repaired/README.md rename to jsonwebkey-convert/README.md diff --git a/jsonwebkey-convert-repaired/src/der.rs b/jsonwebkey-convert/src/der.rs similarity index 100% rename from jsonwebkey-convert-repaired/src/der.rs rename to jsonwebkey-convert/src/der.rs diff --git a/jsonwebkey-convert-repaired/src/jwt.rs b/jsonwebkey-convert/src/jwt.rs similarity index 100% rename from jsonwebkey-convert-repaired/src/jwt.rs rename to jsonwebkey-convert/src/jwt.rs diff --git a/jsonwebkey-convert-repaired/src/lib.rs b/jsonwebkey-convert/src/lib.rs similarity index 100% rename from jsonwebkey-convert-repaired/src/lib.rs rename to jsonwebkey-convert/src/lib.rs diff --git a/jsonwebkey-convert-repaired/testfiles/example-private-key.json b/jsonwebkey-convert/testfiles/example-private-key.json similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/example-private-key.json rename to jsonwebkey-convert/testfiles/example-private-key.json diff --git a/jsonwebkey-convert-repaired/testfiles/example-public-key.json b/jsonwebkey-convert/testfiles/example-public-key.json similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/example-public-key.json rename to jsonwebkey-convert/testfiles/example-public-key.json diff --git a/jsonwebkey-convert-repaired/testfiles/example-symmetric-keys.json b/jsonwebkey-convert/testfiles/example-symmetric-keys.json similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/example-symmetric-keys.json rename to jsonwebkey-convert/testfiles/example-symmetric-keys.json diff --git a/jsonwebkey-convert-repaired/testfiles/test1.json b/jsonwebkey-convert/testfiles/test1.json similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/test1.json rename to jsonwebkey-convert/testfiles/test1.json diff --git a/jsonwebkey-convert-repaired/testfiles/test1.pem b/jsonwebkey-convert/testfiles/test1.pem similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/test1.pem rename to jsonwebkey-convert/testfiles/test1.pem diff --git a/jsonwebkey-convert-repaired/testfiles/test2.json b/jsonwebkey-convert/testfiles/test2.json similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/test2.json rename to jsonwebkey-convert/testfiles/test2.json diff --git a/jsonwebkey-convert-repaired/testfiles/test2.pem b/jsonwebkey-convert/testfiles/test2.pem similarity index 100% rename from jsonwebkey-convert-repaired/testfiles/test2.pem rename to jsonwebkey-convert/testfiles/test2.pem