diff --git a/Cargo.lock b/Cargo.lock index 3ec291c2..3fa2d442 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -838,9 +838,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" [[package]] name = "convert_case" @@ -961,9 +961,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "f322d21b9f3edc2a5d5e2237e78d7b72f4da0b979df0da94cae705df1edd0181" dependencies = [ "generic-array 0.14.5", "rand_core", @@ -1084,13 +1084,13 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "der" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" dependencies = [ "const-oid", - "crypto-bigint", "pem-rfc7468", + "zeroize", ] [[package]] @@ -1162,9 +1162,9 @@ checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "e1e737f9eebb44576f3ee654141a789464071eb369d02c4397b32b6a79790112" dependencies = [ "der", "elliptic-curve", @@ -1183,17 +1183,20 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "bdd8c93ccd534d6a9790f4455cd71e7adb53a12e9af7dd54d1e258473f100cea" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.3", "ff", "generic-array 0.14.5", "group", + "hkdf", "pem-rfc7468", + "pkcs8", "rand_core", "sec1", "subtle", @@ -1241,9 +1244,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" dependencies = [ "rand_core", "subtle", @@ -1472,9 +1475,9 @@ dependencies = [ [[package]] name = "group" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ "ff", "rand_core", @@ -1596,17 +1599,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", + "hmac", ] [[package]] @@ -2214,7 +2207,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "futures-util", - "hmac 0.12.1", + "hmac", "http", "mas-http", "mas-iana", @@ -2391,25 +2384,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -2428,15 +2410,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num-bigint-dig" version = "0.8.1" @@ -2667,14 +2640,13 @@ checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" [[package]] name = "p256" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" +checksum = "f3e7336b74eb43c009656d53a65648b5ff3941b8421207e6a23f42d5aa3a89f3" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", - "sha2 0.9.9", + "sha2 0.10.2", ] [[package]] @@ -2802,9 +2774,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.3.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" dependencies = [ "base64ct", ] @@ -2941,9 +2913,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" +checksum = "2e3a81571d9455414f4d59ce2830bc9d2654e2efc5460fd67b0e0a6a36b6753a" dependencies = [ "der", "pkcs8", @@ -2952,13 +2924,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ "der", "spki", - "zeroize", ] [[package]] @@ -3230,12 +3201,12 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de" dependencies = [ "crypto-bigint", - "hmac 0.11.0", + "hmac", "zeroize", ] @@ -3257,8 +3228,7 @@ dependencies = [ [[package]] name = "rsa" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" +source = "git+https://github.com/sandhose/RSA.git?branch=bump-pkcs#b9fe2248366f7c11c0c5a0ed2604e850448ee88b" dependencies = [ "byteorder", "digest 0.10.3", @@ -3469,10 +3439,11 @@ dependencies = [ [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array 0.14.5", "pkcs8", @@ -3681,11 +3652,11 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" dependencies = [ - "digest 0.9.0", + "digest 0.10.3", "rand_core", ] @@ -3734,9 +3705,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", "der", @@ -3788,7 +3759,7 @@ dependencies = [ "hashlink", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "indexmap", "itoa 1.0.1", "libc", @@ -3896,9 +3867,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" +checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" dependencies = [ "proc-macro2", "quote", diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index d03304de..36e6e7f2 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -25,9 +25,9 @@ sqlx = { version = "0.5.13", features = ["runtime-tokio-rustls", "postgres"] } lettre = { version = "0.10.0-rc.6", default-features = false, features = ["serde", "builder"] } rand = "0.8.5" -rsa = "0.6.1" -p256 = { version = "0.10.1", features = ["ecdsa", "pem", "pkcs8"] } -pkcs8 = { version = "0.8.0", features = ["pem"] } +rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } +p256 = { version = "0.11.0", features = ["ecdsa", "pem", "pkcs8"] } +pkcs8 = { version = "0.9.0", features = ["pem"] } chacha20poly1305 = { version = "0.10.0-pre", features = ["std"] } cookie = { version = "0.16.0", features = ["private", "key-expansion"] } data-encoding = "2.3.2" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 5fd129f2..7bd90a66 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -40,9 +40,9 @@ serde_urlencoded = "0.7.1" argon2 = { version = "0.4.0", features = ["password-hash"] } # Crypto, hashing and signing stuff -rsa = "0.6.1" -pkcs8 = { version = "0.8.0", features = ["pem"] } -elliptic-curve = { version = "0.11.12", features = ["pem"] } +rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } +pkcs8 = { version = "0.9.0", features = ["pem"] } +elliptic-curve = { version = "0.12.0", features = ["pem"] } sha2 = "0.10.2" crc = "3.0.0" diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index adaa7d78..b2757498 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -12,23 +12,23 @@ base64ct = { version = "1.5.0", features = ["std"] } chrono = { version = "0.4.19", features = ["serde"] } crypto-mac = { version = "0.11.1", features = ["std"] } digest = "0.10.3" -ecdsa = { version = "0.13.4", features = ["sign", "verify", "pem", "pkcs8"] } -elliptic-curve = { version = "0.11.12", features = ["ecdh", "pem"] } +ecdsa = { version = "0.14.1", features = ["sign", "verify", "pem", "pkcs8"] } +elliptic-curve = { version = "0.12.0", features = ["ecdh", "pem"] } futures-util = "0.3.21" hmac = "0.12.1" http = "0.2.7" -p256 = { version = "0.10.1", features = ["ecdsa", "pem", "pkcs8"] } -pkcs1 = { version = "0.3.3", features = ["pem", "pkcs8"] } -pkcs8 = { version = "0.8.0", features = ["pem"] } +p256 = { version = "0.11.0", features = ["ecdsa", "pem", "pkcs8"] } +pkcs1 = { version = "0.4.0", features = ["pem", "pkcs8"] } +pkcs8 = { version = "0.9.0", features = ["pem", "std"] } rand = "0.8.5" -rsa = "0.6.1" +rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } schemars = "0.8.8" -sec1 = "0.2.1" +sec1 = "0.3.0" serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" serde_with = { version = "1.13.0", features = ["base64"] } sha2 = "0.10.2" -signature = "1.4.0" +signature = "1.5.0" thiserror = "1.0.31" tokio = { version = "1.18.2", features = ["macros", "rt", "sync"] } tower = { version = "0.4.12", features = ["util"] }