From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- vendor/sha2/.cargo-checksum.json | 2 +- vendor/sha2/CHANGELOG.md | 24 ++++++++++++++++++++++++ vendor/sha2/Cargo.toml | 24 +++++++++++++----------- vendor/sha2/src/lib.rs | 25 +++++++++++++++++-------- 4 files changed, 55 insertions(+), 20 deletions(-) (limited to 'vendor/sha2') diff --git a/vendor/sha2/.cargo-checksum.json b/vendor/sha2/.cargo-checksum.json index abb238e10..d30274379 100644 --- a/vendor/sha2/.cargo-checksum.json +++ b/vendor/sha2/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"72f24c7154bd41c1b97b75d0c34ba48faa9fe1687d5dbc6aad24a332ab5b69da","Cargo.toml":"44a882d60a8a5d1ef0826e2491b8193d835bb44187401f971f6ebaa9faa6d646","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"b7af562922e4a631657acf264772d2af2b72a08d9bbc5fbcf56d9324f9027708","benches/mod.rs":"c32d9f91a541821ea988c14eee710963e623ef1edf69b02b41a29bc44e04ba95","src/consts.rs":"2f820349fa7cbf9fecc1d4aabbd1a721bb1badc3f32ef9e903826960b6f42523","src/core_api.rs":"73b160d98bfa6737688875ad73da5e3c2c93582604dc313d208200e12fdab676","src/lib.rs":"102643cf9efdc2b6a86d16b074d831353a9ec6b7278ecd65c83dfb2bd1a9857f","src/sha256.rs":"cfc2b62a412112e471781a770793f0ba0466594b2e37001334562f3d95f340ce","src/sha256/aarch64.rs":"02dbac483409a853126fec642f964a464e4372f53da2fa4120b29bed204f72b7","src/sha256/soft.rs":"98e765a8e8dfa0af31f2b76570f212e6b3099522bf300e1554cbbd9fd5d02960","src/sha256/x86.rs":"70f1597f2029522b35bfd026df0a8908f086523ab2a80ba3ef35e6231b56353c","src/sha512.rs":"92c4210a627b78505a195722b2f24bac5e6cfdece6292bf184ba8d42e7e2c35f","src/sha512/soft.rs":"0183ad89418b886859d2afa9bf061bc92759ae337c1d26147b4300042e63ef42","src/sha512/x86.rs":"c7dd8bdf3212e1e8c4cc9cc6b380dc0468f79dcfd0f61a445d0d38cead45a03a","tests/data/sha224.blb":"59b185972521af418fd49a079de3d5f5bed74cd76d80473da51cab3faee6c7d0","tests/data/sha256.blb":"bb096934bb7e43e41ce143d211397afca6fcdfe243a39811688ea31aae6f800a","tests/data/sha384.blb":"e8fe66c07ba336fae2c0aa4c87cb768f41bd4ed318ee1a36fbde0a68581946ec","tests/data/sha512.blb":"1cc0e86571f2f4e3bc81438ce7b6c25c118d2d7437355240113f59cbb782c8d6","tests/data/sha512_224.blb":"b02dd46741db1034112e0888d0cdb233a21b9a82c319456f806bbaae49acf440","tests/data/sha512_256.blb":"95195b758e362d92ff0cebebac4cca696512ea5811b635243bc70e29164e5786","tests/mod.rs":"61be596fd9b45a8db345950ff2ed6f87eaf4d239ac156885f36e819da0597644"},"package":"55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"} \ No newline at end of file +{"files":{"CHANGELOG.md":"604cc546b683e035e1f759479e41401c9035e7da6e07808f2cbd7702a07a5d26","Cargo.toml":"a6172879ad5aa1b7a6593e57db16c3d99c00563076239bf094b0d0f5ed6b30f8","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"b4eb00df6e2a4d22518fcaa6a2b4646f249b3a3c9814509b22bd2091f1392ff1","README.md":"b7af562922e4a631657acf264772d2af2b72a08d9bbc5fbcf56d9324f9027708","benches/mod.rs":"c32d9f91a541821ea988c14eee710963e623ef1edf69b02b41a29bc44e04ba95","src/consts.rs":"2f820349fa7cbf9fecc1d4aabbd1a721bb1badc3f32ef9e903826960b6f42523","src/core_api.rs":"73b160d98bfa6737688875ad73da5e3c2c93582604dc313d208200e12fdab676","src/lib.rs":"a286546dab99a51bdb3a5dc4edbd08fb9a57028cb422151f3a97441d113d7425","src/sha256.rs":"cfc2b62a412112e471781a770793f0ba0466594b2e37001334562f3d95f340ce","src/sha256/aarch64.rs":"02dbac483409a853126fec642f964a464e4372f53da2fa4120b29bed204f72b7","src/sha256/soft.rs":"98e765a8e8dfa0af31f2b76570f212e6b3099522bf300e1554cbbd9fd5d02960","src/sha256/x86.rs":"70f1597f2029522b35bfd026df0a8908f086523ab2a80ba3ef35e6231b56353c","src/sha512.rs":"92c4210a627b78505a195722b2f24bac5e6cfdece6292bf184ba8d42e7e2c35f","src/sha512/soft.rs":"0183ad89418b886859d2afa9bf061bc92759ae337c1d26147b4300042e63ef42","src/sha512/x86.rs":"c7dd8bdf3212e1e8c4cc9cc6b380dc0468f79dcfd0f61a445d0d38cead45a03a","tests/data/sha224.blb":"59b185972521af418fd49a079de3d5f5bed74cd76d80473da51cab3faee6c7d0","tests/data/sha256.blb":"bb096934bb7e43e41ce143d211397afca6fcdfe243a39811688ea31aae6f800a","tests/data/sha384.blb":"e8fe66c07ba336fae2c0aa4c87cb768f41bd4ed318ee1a36fbde0a68581946ec","tests/data/sha512.blb":"1cc0e86571f2f4e3bc81438ce7b6c25c118d2d7437355240113f59cbb782c8d6","tests/data/sha512_224.blb":"b02dd46741db1034112e0888d0cdb233a21b9a82c319456f806bbaae49acf440","tests/data/sha512_256.blb":"95195b758e362d92ff0cebebac4cca696512ea5811b635243bc70e29164e5786","tests/mod.rs":"61be596fd9b45a8db345950ff2ed6f87eaf4d239ac156885f36e819da0597644"},"package":"82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"} \ No newline at end of file diff --git a/vendor/sha2/CHANGELOG.md b/vendor/sha2/CHANGELOG.md index 13907854b..127804644 100644 --- a/vendor/sha2/CHANGELOG.md +++ b/vendor/sha2/CHANGELOG.md @@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.10.6 (2022-09-16) +### Added +- Feature-gated OID support ([#405]) + +[#405]: https://github.com/RustCrypto/hashes/pull/405 + +## 0.10.5 (2022-09-02) +### Fixed +- MSRV issue which was not resolved by v0.10.4 ([#401]) + +[#401]: https://github.com/RustCrypto/hashes/pull/401 + +## 0.10.4 (2022-09-02) +### Fixed +- MSRV issue caused by publishing v0.10.3 using a buggy Nightly toolchain ([#399]) + +[#399]: https://github.com/RustCrypto/hashes/pull/399 + +## 0.10.3 (2022-08-30) +### Changed +- Ignore `asm` feature on unsupported targets ([#388]) + +[#388]: https://github.com/RustCrypto/hashes/pull/388 + ## 0.10.2 (2022-02-17) ### Fixed - Minimal versions build ([#363]) diff --git a/vendor/sha2/Cargo.toml b/vendor/sha2/Cargo.toml index c99454e9c..ff23bdc32 100644 --- a/vendor/sha2/Cargo.toml +++ b/vendor/sha2/Cargo.toml @@ -3,16 +3,17 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies. +# to registry (e.g., crates.io) dependencies # -# If you are reading this file be aware that the original Cargo.toml -# will likely look very different (and much more reasonable). -# See Cargo.toml.orig for the original contents. +# If you believe there's an error in this file please file an +# issue against the rust-lang/cargo repository. If you're +# editing this file be aware that the upstream Cargo.toml +# will likely look very different (and much more reasonable) [package] edition = "2018" name = "sha2" -version = "0.10.2" +version = "0.10.6" authors = ["RustCrypto Developers"] description = "Pure Rust implementation of the SHA-2 hash function family\nincluding SHA-224, SHA-256, SHA-384, and SHA-512.\n" documentation = "https://docs.rs/sha2" @@ -28,13 +29,9 @@ rustdoc-args = ["--cfg", "docsrs"] version = "1.0" [dependencies.digest] -version = "0.10.3" - -[dependencies.sha2-asm] -version = "0.6.1" -optional = true +version = "0.10.4" [dev-dependencies.digest] -version = "0.10.3" +version = "0.10.4" features = ["dev"] [dev-dependencies.hex-literal] @@ -46,6 +43,11 @@ asm-aarch64 = ["asm"] compress = [] default = ["std"] force-soft = [] +oid = ["digest/oid"] std = ["digest/std"] [target."cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))".dependencies.cpufeatures] version = "0.2" + +[target."cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))".dependencies.sha2-asm] +version = "0.6.1" +optional = true diff --git a/vendor/sha2/src/lib.rs b/vendor/sha2/src/lib.rs index 6eeec46e0..9082fc5b8 100644 --- a/vendor/sha2/src/lib.rs +++ b/vendor/sha2/src/lib.rs @@ -47,16 +47,18 @@ #![cfg_attr(docsrs, feature(doc_cfg))] #![doc( html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg", - html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg", - html_root_url = "https://docs.rs/sha2/0.10.2" + html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg" )] #![warn(missing_docs, rust_2018_idioms)] pub use digest::{self, Digest}; +#[cfg(feature = "oid")] +use digest::const_oid::{AssociatedOid, ObjectIdentifier}; use digest::{ consts::{U28, U32, U48, U64}, core_api::{CoreWrapper, CtVariableCoreWrapper}, + impl_oid_carrier, }; #[rustfmt::skip] @@ -72,15 +74,22 @@ pub use sha512::compress512; pub use core_api::{Sha256VarCore, Sha512VarCore}; +impl_oid_carrier!(OidSha256, "2.16.840.1.101.3.4.2.1"); +impl_oid_carrier!(OidSha384, "2.16.840.1.101.3.4.2.2"); +impl_oid_carrier!(OidSha512, "2.16.840.1.101.3.4.2.3"); +impl_oid_carrier!(OidSha224, "2.16.840.1.101.3.4.2.4"); +impl_oid_carrier!(OidSha512_224, "2.16.840.1.101.3.4.2.5"); +impl_oid_carrier!(OidSha512_256, "2.16.840.1.101.3.4.2.6"); + /// SHA-224 hasher. -pub type Sha224 = CoreWrapper>; +pub type Sha224 = CoreWrapper>; /// SHA-256 hasher. -pub type Sha256 = CoreWrapper>; +pub type Sha256 = CoreWrapper>; /// SHA-512/224 hasher. -pub type Sha512_224 = CoreWrapper>; +pub type Sha512_224 = CoreWrapper>; /// SHA-512/256 hasher. -pub type Sha512_256 = CoreWrapper>; +pub type Sha512_256 = CoreWrapper>; /// SHA-384 hasher. -pub type Sha384 = CoreWrapper>; +pub type Sha384 = CoreWrapper>; /// SHA-512 hasher. -pub type Sha512 = CoreWrapper>; +pub type Sha512 = CoreWrapper>; -- cgit v1.2.3