diff options
Diffstat (limited to 'vendor/pasetors')
-rw-r--r-- | vendor/pasetors/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/pasetors/CHANGELOG.md | 11 | ||||
-rw-r--r-- | vendor/pasetors/Cargo.toml | 6 | ||||
-rw-r--r-- | vendor/pasetors/LICENSE | 2 | ||||
-rw-r--r-- | vendor/pasetors/README.md | 4 | ||||
-rw-r--r-- | vendor/pasetors/src/lib.rs | 2 | ||||
-rw-r--r-- | vendor/pasetors/src/pae.rs | 12 | ||||
-rw-r--r-- | vendor/pasetors/src/version3.rs | 11 |
8 files changed, 31 insertions, 19 deletions
diff --git a/vendor/pasetors/.cargo-checksum.json b/vendor/pasetors/.cargo-checksum.json index 3a135984c..731ccf01c 100644 --- a/vendor/pasetors/.cargo-checksum.json +++ b/vendor/pasetors/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"a6cea3ef0332f362792b9218a6e4d19262de710569902c49110c28f796b70c7c","Cargo.toml":"5cefa5ac33d3579c408a2c4a17c7e3fc929bf672ec037008ebf5c5abc5c805bc","LICENSE":"27752522f6d229c9fa38ab123506bc04819dcf865244afc6588235dc99d239ab","README.md":"eee26e26f1b42a78766ec5f3f9e7373824340e3d95c690ec27de008799d8eb27","src/claims.rs":"2086f5f55bd89a48bddf8aa35ccc9818a4411e79903787cb7f473a620fdcc4e8","src/common.rs":"1fcf08b5f0a035559484f152b6d7f9be5c69976a6d9107ecf26e4b68719fc1e9","src/errors.rs":"8e2c5f5e85d726ac0e664d09c0b5117dd8e40b940d2f4b2fff5112f277129b81","src/footer.rs":"32d0a8db1f62c11ee78363c9b175215c8b2c33c761ab7832e3c10d12473a945d","src/keys.rs":"3e0f249a2de6909d35bdc88dbe1e0bd591e552a10f19b36d8f2cedd633da1671","src/lib.rs":"824d562ad99be64baed49b78a8c3dd21bb8b3c94f0ad9212db3ab8a9006856f8","src/pae.rs":"80d5269fb2f9ca311e4930b217a8b01074f864bacba2cc8f51cc3cc8c8becc2d","src/paserk.rs":"8fab1ac06a4bb5666e651fc3794f9a59ea76c6aa5c4f710a57a01d1fa381438a","src/serde.rs":"3359a60a1fd46ea9140ee7adcf6f92a48fbdda80e87a33f9144864878a71a7ee","src/token.rs":"2b2016664cd0e4e3164ab5dd4bc009c36fd9a750090dc78b407119f4cf33dc2d","src/version.rs":"d340261226d6592ac48f3648a8242dc61d7e7a8e7a59f4a4d87de2d87b74d05e","src/version2.rs":"87b84cb64e66ee83bd4ca0439faadd9bfefc47f34bf178e4d887cadb6ffacdf6","src/version3.rs":"f8b097c2edccc687a73430edeb636a1e1c4778f76fa629ad944e607c6692a432","src/version4.rs":"c28ebd71acc681ef7b16912d579bff768b38068a83e5912a0c0f63aeea3d5e99","test_vectors/PASERK/k2.lid.json":"c5f5b1bf3449ab9c58abf983270578027d03f41bce00cd8c49d4086745aeca7e","test_vectors/PASERK/k2.local.json":"335f3f1aa056f98ceb7ea691e26f3837ae33d566006d35530cfdc4940b676cdc","test_vectors/PASERK/k2.pid.json":"2b700fa931d3d6e9f0cb693d6d64bec0fb2a290f7059b78ea6eabff14aadadb8","test_vectors/PASERK/k2.public.json":"5fc4c039258046936a3b26dca2d8581a5831a7279186f6a629114ff2c70b1354","test_vectors/PASERK/k2.secret.json":"fda27580d0dc2931033bf9e3660b2d37cc3d6f1272f966dfdfb88e936cd7f660","test_vectors/PASERK/k2.sid.json":"aea692b0bfcc971eacc437869160b0988b21a5138c4109544acef0d6c8150df2","test_vectors/PASERK/k3.pid.json":"d257888dfe3aa5803bb71e3a2886bbf2761de9f7cff0737c553d8639eac0ff3b","test_vectors/PASERK/k3.public.json":"a5d1e05238fead0afa860b5037c973ad9e3a62ab26fb8675889393442d18cd35","test_vectors/PASERK/k3.secret.json":"d7c37094f0365c6afe6bba3ea28c164c21c54c769bf925ab2fac7c9ed5c1ae65","test_vectors/PASERK/k3.sid.json":"f77a2a8b97cf787579a82581b4be167d8d1906ab3c1e4ea16a299c2a8d2dc10a","test_vectors/PASERK/k4.lid.json":"893dc77e6b2a82a6e98ed683293a541fae50fd5447713ce89a2e9c7efd54529b","test_vectors/PASERK/k4.local.json":"71c76cafab9cbeb5223425105f08900b245048a9a2a7d573b9a3f1f3d4633ebc","test_vectors/PASERK/k4.pid.json":"b5735e8734e17afe2da884b7ce76aa79e2d34b6be27834c7f1d6b7c1304d911d","test_vectors/PASERK/k4.public.json":"f8d86e8b05baf2bd67fcf77f1451fe49fb6232ce1358032f8fa5070d8e3bcc55","test_vectors/PASERK/k4.secret.json":"87a2e6880df94c80f5a645f24c4c9100b12b678a236fb80c2232d62d4cbcc22c","test_vectors/PASERK/k4.sid.json":"ca500b86c33fad8145466379c4e0ba727d92803abd27fe97b7ea6886459792f0","test_vectors/v2.json":"b58b11047f26596acdbcad7cfd4e270bc3e917f86e2be85b22f0d6be06ae79d0","test_vectors/v3.json":"79cfd384762a6df3c6ce08ff04d9fb24f128943c2e38e3333f3e440a8546d8a4","test_vectors/v4.json":"0b72948b65d1f73f574c9ad2aa3481ec27bf8c632f5f6e1596cd41f5b9703387","test_vectors/wycheproof/ecdsa_secp384r1_sha384_test.json":"40f75fd0ae931c110cf5a4a4977e6cea40e4877f922289ac8685fa6c4b70c572","test_vectors/wycheproof/ecdsa_secp384r1_sha3_384_test.json":"5b00927809ac9809c9b58a51771a53d4ce06327f5269b6e08912244958a3ec06"},"package":"ed20c4c21d893414f42e0cbfebe8a8036b5ae9b0264611fb6504e395eda6ceec"}
\ No newline at end of file +{"files":{"CHANGELOG.md":"8c750fc92f0e9dc0d9d05016e9c90d3f82e9c7aa0eb3791b6d166314242dbe15","Cargo.toml":"14462eb8753564324380e2bb54aa996c2da7d992462d0ddc201b7ccdabd1928f","LICENSE":"c8dba4239d56fb2d257aee9e4bdb99fea001ea6e3a99f6775fbd2c710956df36","README.md":"39d33e04b62401e17a471a9251ee84aa476efb01bdc509b8e42dc6dfe6aaf88a","src/claims.rs":"2086f5f55bd89a48bddf8aa35ccc9818a4411e79903787cb7f473a620fdcc4e8","src/common.rs":"1fcf08b5f0a035559484f152b6d7f9be5c69976a6d9107ecf26e4b68719fc1e9","src/errors.rs":"8e2c5f5e85d726ac0e664d09c0b5117dd8e40b940d2f4b2fff5112f277129b81","src/footer.rs":"32d0a8db1f62c11ee78363c9b175215c8b2c33c761ab7832e3c10d12473a945d","src/keys.rs":"3e0f249a2de6909d35bdc88dbe1e0bd591e552a10f19b36d8f2cedd633da1671","src/lib.rs":"9f04a229a38bcd9c5767a7889356f0583e7a97702707d836ae3988b52f4a6123","src/pae.rs":"cecb8dafbdf331b6b32e60d1fc5f666a6cc614947188695f1854e00bb84b1f01","src/paserk.rs":"8fab1ac06a4bb5666e651fc3794f9a59ea76c6aa5c4f710a57a01d1fa381438a","src/serde.rs":"3359a60a1fd46ea9140ee7adcf6f92a48fbdda80e87a33f9144864878a71a7ee","src/token.rs":"2b2016664cd0e4e3164ab5dd4bc009c36fd9a750090dc78b407119f4cf33dc2d","src/version.rs":"d340261226d6592ac48f3648a8242dc61d7e7a8e7a59f4a4d87de2d87b74d05e","src/version2.rs":"87b84cb64e66ee83bd4ca0439faadd9bfefc47f34bf178e4d887cadb6ffacdf6","src/version3.rs":"104f123b3cf410604045d0bc2451efe05b90072bfa9eb1feb5095f1949ea208f","src/version4.rs":"c28ebd71acc681ef7b16912d579bff768b38068a83e5912a0c0f63aeea3d5e99","test_vectors/PASERK/k2.lid.json":"c5f5b1bf3449ab9c58abf983270578027d03f41bce00cd8c49d4086745aeca7e","test_vectors/PASERK/k2.local.json":"335f3f1aa056f98ceb7ea691e26f3837ae33d566006d35530cfdc4940b676cdc","test_vectors/PASERK/k2.pid.json":"2b700fa931d3d6e9f0cb693d6d64bec0fb2a290f7059b78ea6eabff14aadadb8","test_vectors/PASERK/k2.public.json":"5fc4c039258046936a3b26dca2d8581a5831a7279186f6a629114ff2c70b1354","test_vectors/PASERK/k2.secret.json":"fda27580d0dc2931033bf9e3660b2d37cc3d6f1272f966dfdfb88e936cd7f660","test_vectors/PASERK/k2.sid.json":"aea692b0bfcc971eacc437869160b0988b21a5138c4109544acef0d6c8150df2","test_vectors/PASERK/k3.pid.json":"d257888dfe3aa5803bb71e3a2886bbf2761de9f7cff0737c553d8639eac0ff3b","test_vectors/PASERK/k3.public.json":"a5d1e05238fead0afa860b5037c973ad9e3a62ab26fb8675889393442d18cd35","test_vectors/PASERK/k3.secret.json":"d7c37094f0365c6afe6bba3ea28c164c21c54c769bf925ab2fac7c9ed5c1ae65","test_vectors/PASERK/k3.sid.json":"f77a2a8b97cf787579a82581b4be167d8d1906ab3c1e4ea16a299c2a8d2dc10a","test_vectors/PASERK/k4.lid.json":"893dc77e6b2a82a6e98ed683293a541fae50fd5447713ce89a2e9c7efd54529b","test_vectors/PASERK/k4.local.json":"71c76cafab9cbeb5223425105f08900b245048a9a2a7d573b9a3f1f3d4633ebc","test_vectors/PASERK/k4.pid.json":"b5735e8734e17afe2da884b7ce76aa79e2d34b6be27834c7f1d6b7c1304d911d","test_vectors/PASERK/k4.public.json":"f8d86e8b05baf2bd67fcf77f1451fe49fb6232ce1358032f8fa5070d8e3bcc55","test_vectors/PASERK/k4.secret.json":"87a2e6880df94c80f5a645f24c4c9100b12b678a236fb80c2232d62d4cbcc22c","test_vectors/PASERK/k4.sid.json":"ca500b86c33fad8145466379c4e0ba727d92803abd27fe97b7ea6886459792f0","test_vectors/v2.json":"b58b11047f26596acdbcad7cfd4e270bc3e917f86e2be85b22f0d6be06ae79d0","test_vectors/v3.json":"79cfd384762a6df3c6ce08ff04d9fb24f128943c2e38e3333f3e440a8546d8a4","test_vectors/v4.json":"0b72948b65d1f73f574c9ad2aa3481ec27bf8c632f5f6e1596cd41f5b9703387","test_vectors/wycheproof/ecdsa_secp384r1_sha384_test.json":"40f75fd0ae931c110cf5a4a4977e6cea40e4877f922289ac8685fa6c4b70c572","test_vectors/wycheproof/ecdsa_secp384r1_sha3_384_test.json":"5b00927809ac9809c9b58a51771a53d4ce06327f5269b6e08912244958a3ec06"},"package":"824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69"}
\ No newline at end of file diff --git a/vendor/pasetors/CHANGELOG.md b/vendor/pasetors/CHANGELOG.md index 72aaa879a..ca9be2363 100644 --- a/vendor/pasetors/CHANGELOG.md +++ b/vendor/pasetors/CHANGELOG.md @@ -1,3 +1,14 @@ +### 0.6.6 + +__Date:__ March 4, 2023. + +__Changelog:__ +- Update license year to 2023. +- Bump `p384` to `0.13.0` +- Bump MSRV to `1.65.0` +- Switch from `actions-rs/tarpaulin` to `cargo-tarpaulin` in CI. + + ### 0.6.5 __Date:__ December 14, 2022. diff --git a/vendor/pasetors/Cargo.toml b/vendor/pasetors/Cargo.toml index bb0215299..f90220917 100644 --- a/vendor/pasetors/Cargo.toml +++ b/vendor/pasetors/Cargo.toml @@ -11,9 +11,9 @@ [package] edition = "2018" -rust-version = "1.59.0" +rust-version = "1.65.0" name = "pasetors" -version = "0.6.5" +version = "0.6.6" authors = ["brycx <brycx@protonmail.com>"] description = "PASETO: Platform-Agnostic Security Tokens (in Rust)" documentation = "https://docs.rs/pasetors" @@ -59,7 +59,7 @@ optional = true default-features = false [dependencies.p384] -version = "0.11.0" +version = "0.13.0" optional = true [dependencies.rand_core] diff --git a/vendor/pasetors/LICENSE b/vendor/pasetors/LICENSE index 554262182..3f00453d0 100644 --- a/vendor/pasetors/LICENSE +++ b/vendor/pasetors/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2022 brycx +Copyright (c) 2020-2023 brycx Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/pasetors/README.md b/vendor/pasetors/README.md index 2b0069246..515f199a8 100644 --- a/vendor/pasetors/README.md +++ b/vendor/pasetors/README.md @@ -1,4 +1,4 @@ -![Tests](https://github.com/brycx/pasetors/workflows/Tests/badge.svg) [![Documentation](https://docs.rs/pasetors/badge.svg)](https://docs.rs/pasetors/) [![Crates.io](https://img.shields.io/crates/v/pasetors.svg)](https://crates.io/crates/pasetors) [![Safety Dance](https://img.shields.io/badge/unsafe-forbidden-success.svg)](https://github.com/rust-secure-code/safety-dance/) [![MSRV](https://img.shields.io/badge/MSRV-1.59.0-informational.svg)](https://img.shields.io/badge/MSRV-1.59.0-informational) [![codecov](https://codecov.io/gh/brycx/pasetors/branch/master/graph/badge.svg)](https://codecov.io/gh/brycx/pasetors) +![Tests](https://github.com/brycx/pasetors/workflows/Tests/badge.svg) [![Documentation](https://docs.rs/pasetors/badge.svg)](https://docs.rs/pasetors/) [![Crates.io](https://img.shields.io/crates/v/pasetors.svg)](https://crates.io/crates/pasetors) [![Safety Dance](https://img.shields.io/badge/unsafe-forbidden-success.svg)](https://github.com/rust-secure-code/safety-dance/) [![MSRV](https://img.shields.io/badge/MSRV-1.65.0-informational.svg)](https://img.shields.io/badge/MSRV-1.65.0-informational) [![codecov](https://codecov.io/gh/brycx/pasetors/branch/master/graph/badge.svg)](https://codecov.io/gh/brycx/pasetors) ### PASETOrs @@ -26,7 +26,7 @@ This library includes: This library has **not undergone any third-party security audit**. Usage is at **own risk**. ### Minimum Supported Rust Version -Rust 1.59.0 or later is supported however, the majority of testing happens with latest stable Rust. +Rust 1.65.0 or later is supported however, the majority of testing happens with latest stable Rust. MSRV may be changed at any point and will not be considered a SemVer breaking change. diff --git a/vendor/pasetors/src/lib.rs b/vendor/pasetors/src/lib.rs index a921e9272..6b58b8378 100644 --- a/vendor/pasetors/src/lib.rs +++ b/vendor/pasetors/src/lib.rs @@ -183,7 +183,7 @@ unused_qualifications, overflowing_literals )] -#![doc(html_root_url = "https://docs.rs/pasetors/0.6.5")] +#![doc(html_root_url = "https://docs.rs/pasetors/0.6.6")] #![cfg_attr(docsrs, feature(doc_cfg))] #[macro_use] diff --git a/vendor/pasetors/src/pae.rs b/vendor/pasetors/src/pae.rs index e72e849b0..7bb7746c7 100644 --- a/vendor/pasetors/src/pae.rs +++ b/vendor/pasetors/src/pae.rs @@ -53,26 +53,26 @@ mod unit_tests { #[test] fn test_pae() { // Source: https://github.com/paragonie/paseto/blob/master/tests/UtilTest.php - assert_eq!("0000000000000000", hex::encode(&pae(&[]).unwrap())); + assert_eq!("0000000000000000", hex::encode(pae(&[]).unwrap())); assert_eq!( "01000000000000000000000000000000", - hex::encode(&pae(&[b""]).unwrap()) + hex::encode(pae(&[b""]).unwrap()) ); assert_eq!( "020000000000000000000000000000000000000000000000", - hex::encode(&pae(&[b"", b""]).unwrap()) + hex::encode(pae(&[b"", b""]).unwrap()) ); assert_eq!( "0100000000000000070000000000000050617261676f6e", - hex::encode(&pae(&[b"Paragon"]).unwrap()) + hex::encode(pae(&[b"Paragon"]).unwrap()) ); assert_eq!( "0200000000000000070000000000000050617261676f6e0a00000000000000496e6974696174697665", - hex::encode(&pae(&[b"Paragon", b"Initiative",]).unwrap()) + hex::encode(pae(&[b"Paragon", b"Initiative",]).unwrap()) ); assert_eq!( "0100000000000000190000000000000050617261676f6e0a00000000000000496e6974696174697665", - hex::encode(&pae(&[b"Paragon\n\0\0\0\0\0\0\0Initiative"]).unwrap()) + hex::encode(pae(&[b"Paragon\n\0\0\0\0\0\0\0Initiative"]).unwrap()) ); } } diff --git a/vendor/pasetors/src/version3.rs b/vendor/pasetors/src/version3.rs index 5c84a689a..9a2628bc5 100644 --- a/vendor/pasetors/src/version3.rs +++ b/vendor/pasetors/src/version3.rs @@ -77,7 +77,7 @@ impl TryFrom<&AsymmetricSecretKey<V3>> for AsymmetricPublicKey<V3> { type Error = Error; fn try_from(value: &AsymmetricSecretKey<V3>) -> Result<Self, Self::Error> { - let sk = SigningKey::from_bytes(value.as_bytes()).map_err(|_| Error::Key)?; + let sk = SigningKey::from_bytes(value.as_bytes().into()).map_err(|_| Error::Key)?; AsymmetricPublicKey::<V3>::from(sk.verifying_key().to_encoded_point(true).as_bytes()) } } @@ -167,7 +167,8 @@ impl PublicToken { return Err(Error::EmptyPayload); } - let signing_key = SigningKey::from_bytes(secret_key.as_bytes()).map_err(|_| Error::Key)?; + let signing_key = + SigningKey::from_bytes(secret_key.as_bytes().into()).map_err(|_| Error::Key)?; let public_key = VerifyingKey::from(&signing_key).to_encoded_point(true); let f = footer.unwrap_or(&[]); @@ -177,13 +178,13 @@ impl PublicToken { let mut msg_digest = sha2::Sha384::new(); msg_digest.update(m2); - let sig = signing_key + let sig: Signature = signing_key .try_sign_digest(msg_digest) .map_err(|_| Error::Signing)?; - debug_assert_eq!(sig.as_ref().len(), V3::PUBLIC_SIG); + debug_assert_eq!(sig.to_bytes().len(), V3::PUBLIC_SIG); let mut m_sig: Vec<u8> = Vec::from(message); - m_sig.extend_from_slice(sig.as_ref()); + m_sig.extend_from_slice(&sig.to_bytes()); let token_no_footer = format!("{}{}", Self::HEADER, encode_b64(m_sig)?); |