diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8258df4..b477627 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,9 @@ jobs: - name: Install Python dependencies run: | python -m pip install toml + - name: Install reuse + run: | + sudo apt install -y reuse - name: Install rust run: | rustup show diff --git a/Cargo.toml b/Cargo.toml index 70b4fc7..cb2a43f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,7 @@ serde = ["dep:serde", "serde_bytes"] builder = ["typed-builder"] log-all = [] +log-trace = [] log-debug = [] log-info = [] log-warn = [] diff --git a/Makefile b/Makefile index c20d66c..cbcaf9f 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ check: src/se05x/commands.rs .PHONY: lint lint: src/se05x/commands.rs verify-commands + reuse lint cargo c cargo fmt --check cargo clippy @@ -34,7 +35,11 @@ lint: src/se05x/commands.rs verify-commands cargo doc --features aes-session,builder,serde --no-deps README.md: src/lib.rs Makefile - grep '//!' src/lib.rs |grep -v '//! # ' | sed 's/^...//g' | sed 's/^ //g' > README.md + # REUSE-IgnoreStart + echo '' > README.md + echo '' >> README.md + # REUSE-IgnoreEnd + grep '//!' src/lib.rs |grep -v '//! # ' | sed 's/^...//g' | sed 's/^ //g' >> README.md .PHONY: ci ci: export RUSTFLAGS=-Dwarnings diff --git a/README.md b/README.md index a688971..2ed55b4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ + + SE05X driver =========== diff --git a/generate_commands.py b/generate_commands.py index 3300839..68a9ade 100644 --- a/generate_commands.py +++ b/generate_commands.py @@ -132,12 +132,16 @@ def flatten(items): break payload_lifetime = "" + payload_lifetime_inferred = "" if payload_has_lifetime: payload_lifetime = "<'data>" + payload_lifetime_inferred = "<'_>" response_lifetime = "" + response_lifetime_inferred = "" if response_has_lifetime: response_lifetime = "<'data>" + response_lifetime_inferred = "<'_>" outfile.write("#[derive(Clone, Debug, PartialEq, Eq)]\n") @@ -207,7 +211,7 @@ def flatten(items): if force_extended: command_builder = f'{command_builder}.force_extended()' - outfile.write(f'impl{payload_lifetime} DataSource for {name}{payload_lifetime} {{\n') + outfile.write(f'impl DataSource for {name}{payload_lifetime_inferred} {{\n') outfile.write(' fn len(&self) -> usize {\n') outfile.write(f' {slice_val_pre}') outfile.write(f' let __data: &[&dyn DataSource] = {slice_val};\n') @@ -222,12 +226,8 @@ def flatten(items): outfile.write(' }\n') outfile.write("}\n") - bound = "" - if payload_has_lifetime: - bound = "<'data, W: Writer>" - - outfile.write(f'impl{bound} DataStream for {name}{payload_lifetime} {{\n') + outfile.write(f'impl DataStream for {name}{payload_lifetime_inferred} {{\n') outfile.write(' fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> {\n') outfile.write(f' {slice_val_pre}') outfile.write(f' let __data: &[&dyn DataStream] = {slice_val};\n') @@ -264,7 +264,7 @@ def flatten(items): outfile.write("}\n") outfile.write("\n") - outfile.write(f'impl{bound} Se05XCommand for {name}{payload_lifetime} {{\n') + outfile.write(f'impl Se05XCommand for {name}{payload_lifetime_inferred} {{\n') if "response" not in v: outfile.write(f' type Response<\'rdata> = ();\n') elif response_has_lifetime: diff --git a/src/doc_utils.rs b/src/doc_utils.rs index 244a248..38c9998 100644 --- a/src/doc_utils.rs +++ b/src/doc_utils.rs @@ -1,3 +1,5 @@ +// Copyright (C) 2023 Nitrokey GmbH +// SPDX-License-Identifier: LGPL-3.0-only // utilities for doctests // // Not included in the crate, meant to be used with `include!` diff --git a/src/se05x.rs b/src/se05x.rs index aafc0bc..6e93df6 100644 --- a/src/se05x.rs +++ b/src/se05x.rs @@ -92,7 +92,7 @@ pub trait Se05XCommand: DataStream { type Response<'a>: Se05XResponse<'a>; } -impl<'b, W: Writer, C: Se05XCommand> Se05XCommand for &'b C { +impl> Se05XCommand for &'_ C { type Response<'a> = C::Response<'a>; } @@ -1749,7 +1749,7 @@ where Ok((value.map(TryInto::try_into).transpose()?, rem)) } -impl<'a> commands::ReadEcCurveListResponse<'a> { +impl commands::ReadEcCurveListResponse<'_> { pub fn is_set(&self, curve: EcCurve) -> bool { let id: u8 = curve.into(); if id >= 0x40 { diff --git a/src/se05x/commands.rs b/src/se05x/commands.rs index ad5cba9..30fce6e 100644 --- a/src/se05x/commands.rs +++ b/src/se05x/commands.rs @@ -79,7 +79,7 @@ pub struct ExchangeSessionData<'data> { pub c_mac: &'data [u8], } -impl<'data> DataSource for ExchangeSessionData<'data> { +impl DataSource for ExchangeSessionData<'_> { fn len(&self) -> usize { let session_policy = &Tlv::new(TAG_1, self.session_policy); let c_mac = &self.c_mac; @@ -99,7 +99,7 @@ impl<'data> DataSource for ExchangeSessionData<'data> { false } } -impl<'data, W: Writer> DataStream for ExchangeSessionData<'data> { +impl DataStream for ExchangeSessionData<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let session_policy = &Tlv::new(TAG_1, self.session_policy); let c_mac = &self.c_mac; @@ -130,7 +130,7 @@ impl<'data> Se05XResponse<'data> for ExchangeSessionDataResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for ExchangeSessionData<'data> { +impl Se05XCommand for ExchangeSessionData<'_> { type Response<'rdata> = ExchangeSessionDataResponse<'rdata>; } @@ -243,7 +243,7 @@ pub struct VerifySessionUserId<'data> { pub user_id: &'data [u8], } -impl<'data> DataSource for VerifySessionUserId<'data> { +impl DataSource for VerifySessionUserId<'_> { fn len(&self) -> usize { let user_id = &Tlv::new(TAG_1, self.user_id); let __data: &[&dyn DataSource] = &[user_id]; @@ -262,7 +262,7 @@ impl<'data> DataSource for VerifySessionUserId<'data> { false } } -impl<'data, W: Writer> DataStream for VerifySessionUserId<'data> { +impl DataStream for VerifySessionUserId<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let user_id = &Tlv::new(TAG_1, self.user_id); let __data: &[&dyn DataStream] = &[user_id]; @@ -288,7 +288,7 @@ impl<'data> Se05XResponse<'data> for VerifySessionUserIdResponse { } } -impl<'data, W: Writer> Se05XCommand for VerifySessionUserId<'data> { +impl Se05XCommand for VerifySessionUserId<'_> { type Response<'rdata> = VerifySessionUserIdResponse; } @@ -484,7 +484,7 @@ pub struct WriteEcKey<'data> { pub public_key: Option<&'data [u8]>, } -impl<'data> DataSource for WriteEcKey<'data> { +impl DataSource for WriteEcKey<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -522,7 +522,7 @@ impl<'data> DataSource for WriteEcKey<'data> { false } } -impl<'data, W: Writer> DataStream for WriteEcKey<'data> { +impl DataStream for WriteEcKey<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -557,7 +557,7 @@ impl<'data, W: Writer> DataStream for WriteEcKey<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteEcKey<'data> { +impl Se05XCommand for WriteEcKey<'_> { type Response<'rdata> = (); } @@ -611,7 +611,7 @@ pub struct WriteRsaKey<'data> { pub n: Option<&'data [u8]>, } -impl<'data> DataSource for WriteRsaKey<'data> { +impl DataSource for WriteRsaKey<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -665,7 +665,7 @@ impl<'data> DataSource for WriteRsaKey<'data> { false } } -impl<'data, W: Writer> DataStream for WriteRsaKey<'data> { +impl DataStream for WriteRsaKey<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -716,7 +716,7 @@ impl<'data, W: Writer> DataStream for WriteRsaKey<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteRsaKey<'data> { +impl Se05XCommand for WriteRsaKey<'_> { type Response<'rdata> = (); } @@ -742,7 +742,7 @@ pub struct GenRsaKey<'data> { pub key_size: Option>, } -impl<'data> DataSource for GenRsaKey<'data> { +impl DataSource for GenRsaKey<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -770,7 +770,7 @@ impl<'data> DataSource for GenRsaKey<'data> { false } } -impl<'data, W: Writer> DataStream for GenRsaKey<'data> { +impl DataStream for GenRsaKey<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -795,7 +795,7 @@ impl<'data, W: Writer> DataStream for GenRsaKey<'data> { } } -impl<'data, W: Writer> Se05XCommand for GenRsaKey<'data> { +impl Se05XCommand for GenRsaKey<'_> { type Response<'rdata> = (); } @@ -824,7 +824,7 @@ pub struct WriteSymmKey<'data> { pub value: &'data [u8], } -impl<'data> DataSource for WriteSymmKey<'data> { +impl DataSource for WriteSymmKey<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -854,7 +854,7 @@ impl<'data> DataSource for WriteSymmKey<'data> { false } } -impl<'data, W: Writer> DataStream for WriteSymmKey<'data> { +impl DataStream for WriteSymmKey<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -881,7 +881,7 @@ impl<'data, W: Writer> DataStream for WriteSymmKey<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteSymmKey<'data> { +impl Se05XCommand for WriteSymmKey<'_> { type Response<'rdata> = (); } @@ -910,7 +910,7 @@ pub struct WriteBinary<'data> { pub data: Option<&'data [u8]>, } -impl<'data> DataSource for WriteBinary<'data> { +impl DataSource for WriteBinary<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -932,7 +932,7 @@ impl<'data> DataSource for WriteBinary<'data> { false } } -impl<'data, W: Writer> DataStream for WriteBinary<'data> { +impl DataStream for WriteBinary<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -951,7 +951,7 @@ impl<'data, W: Writer> DataStream for WriteBinary<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteBinary<'data> { +impl Se05XCommand for WriteBinary<'_> { type Response<'rdata> = (); } @@ -972,7 +972,7 @@ pub struct WriteUserId<'data> { pub data: &'data [u8], } -impl<'data> DataSource for WriteUserId<'data> { +impl DataSource for WriteUserId<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -996,7 +996,7 @@ impl<'data> DataSource for WriteUserId<'data> { false } } -impl<'data, W: Writer> DataStream for WriteUserId<'data> { +impl DataStream for WriteUserId<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let max_attempts = &self @@ -1017,7 +1017,7 @@ impl<'data, W: Writer> DataStream for WriteUserId<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteUserId<'data> { +impl Se05XCommand for WriteUserId<'_> { type Response<'rdata> = (); } @@ -1041,7 +1041,7 @@ pub struct WriteCounter<'data> { pub value: Option>, } -impl<'data> DataSource for WriteCounter<'data> { +impl DataSource for WriteCounter<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -1062,7 +1062,7 @@ impl<'data> DataSource for WriteCounter<'data> { false } } -impl<'data, W: Writer> DataStream for WriteCounter<'data> { +impl DataStream for WriteCounter<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -1080,7 +1080,7 @@ impl<'data, W: Writer> DataStream for WriteCounter<'data> { } } -impl<'data, W: Writer> Se05XCommand for WriteCounter<'data> { +impl Se05XCommand for WriteCounter<'_> { type Response<'rdata> = (); } @@ -1104,7 +1104,7 @@ pub struct WritePcr<'data> { pub extend: Option<&'data [u8]>, } -impl<'data> DataSource for WritePcr<'data> { +impl DataSource for WritePcr<'_> { fn len(&self) -> usize { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -1125,7 +1125,7 @@ impl<'data> DataSource for WritePcr<'data> { false } } -impl<'data, W: Writer> DataStream for WritePcr<'data> { +impl DataStream for WritePcr<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let policy = &self.policy.map(|data| Tlv::new(TAG_POLICY, data)); let object_id = &Tlv::new(TAG_1, self.object_id); @@ -1143,7 +1143,7 @@ impl<'data, W: Writer> DataStream for WritePcr<'data> { } } -impl<'data, W: Writer> Se05XCommand for WritePcr<'data> { +impl Se05XCommand for WritePcr<'_> { type Response<'rdata> = (); } @@ -1165,7 +1165,7 @@ pub struct ImportObject<'data> { pub serialized_object: &'data [u8], } -impl<'data> DataSource for ImportObject<'data> { +impl DataSource for ImportObject<'_> { fn len(&self) -> usize { let object_id = &Tlv::new(TAG_1, self.object_id); let rsa_key_component = &self.rsa_key_component.map(|data| Tlv::new(TAG_2, data)); @@ -1185,7 +1185,7 @@ impl<'data> DataSource for ImportObject<'data> { false } } -impl<'data, W: Writer> DataStream for ImportObject<'data> { +impl DataStream for ImportObject<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let object_id = &Tlv::new(TAG_1, self.object_id); let rsa_key_component = &self.rsa_key_component.map(|data| Tlv::new(TAG_2, data)); @@ -1202,7 +1202,7 @@ impl<'data, W: Writer> DataStream for ImportObject<'data> { } } -impl<'data, W: Writer> Se05XCommand for ImportObject<'data> { +impl Se05XCommand for ImportObject<'_> { type Response<'rdata> = (); } @@ -1309,7 +1309,7 @@ pub struct ReadAttestObject<'data> { pub freshness_random: &'data [u8; 16], } -impl<'data> DataSource for ReadAttestObject<'data> { +impl DataSource for ReadAttestObject<'_> { fn len(&self) -> usize { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1342,7 +1342,7 @@ impl<'data> DataSource for ReadAttestObject<'data> { false } } -impl<'data, W: Writer> DataStream for ReadAttestObject<'data> { +impl DataStream for ReadAttestObject<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1411,7 +1411,7 @@ impl<'data> Se05XResponse<'data> for ReadAttestObjectResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for ReadAttestObject<'data> { +impl Se05XCommand for ReadAttestObject<'_> { type Response<'rdata> = ReadAttestObjectResponse<'rdata>; } @@ -1433,7 +1433,7 @@ pub struct ReadAttributes<'data> { pub rsa_key_component: Option<&'data [u8]>, } -impl<'data> DataSource for ReadAttributes<'data> { +impl DataSource for ReadAttributes<'_> { fn len(&self) -> usize { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1449,7 +1449,7 @@ impl<'data> DataSource for ReadAttributes<'data> { false } } -impl<'data, W: Writer> DataStream for ReadAttributes<'data> { +impl DataStream for ReadAttributes<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1476,7 +1476,7 @@ impl<'data> Se05XResponse<'data> for ReadAttributesResponse { } } -impl<'data, W: Writer> Se05XCommand for ReadAttributes<'data> { +impl Se05XCommand for ReadAttributes<'_> { type Response<'rdata> = ReadAttributesResponse; } @@ -1505,7 +1505,7 @@ pub struct ReadAttributesAttest<'data> { pub freshness_random: Option<&'data [u8; 16]>, } -impl<'data> DataSource for ReadAttributesAttest<'data> { +impl DataSource for ReadAttributesAttest<'_> { fn len(&self) -> usize { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1538,7 +1538,7 @@ impl<'data> DataSource for ReadAttributesAttest<'data> { false } } -impl<'data, W: Writer> DataStream for ReadAttributesAttest<'data> { +impl DataStream for ReadAttributesAttest<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let object_id = &Tlv::new(TAG_1, self.object_id); let offset = &self.offset.map(|data| Tlv::new(TAG_2, data)); @@ -1600,7 +1600,7 @@ impl<'data> Se05XResponse<'data> for ReadAttributesAttestResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for ReadAttributesAttest<'data> { +impl Se05XCommand for ReadAttributesAttest<'_> { type Response<'rdata> = ReadAttributesAttestResponse<'rdata>; } @@ -2005,7 +2005,7 @@ pub struct SetEcCurveParam<'data> { pub value: &'data [u8], } -impl<'data> DataSource for SetEcCurveParam<'data> { +impl DataSource for SetEcCurveParam<'_> { fn len(&self) -> usize { let curve = &Tlv::new(TAG_1, self.curve); let param = &Tlv::new(TAG_2, self.param); @@ -2019,7 +2019,7 @@ impl<'data> DataSource for SetEcCurveParam<'data> { false } } -impl<'data, W: Writer> DataStream for SetEcCurveParam<'data> { +impl DataStream for SetEcCurveParam<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let curve = &Tlv::new(TAG_1, self.curve); let param = &Tlv::new(TAG_2, self.param); @@ -2030,7 +2030,7 @@ impl<'data, W: Writer> DataStream for SetEcCurveParam<'data> { } } -impl<'data, W: Writer> Se05XCommand for SetEcCurveParam<'data> { +impl Se05XCommand for SetEcCurveParam<'_> { type Response<'rdata> = (); } @@ -2391,7 +2391,7 @@ pub struct EcdsaSign<'data> { pub data: &'data [u8], } -impl<'data> DataSource for EcdsaSign<'data> { +impl DataSource for EcdsaSign<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2412,7 +2412,7 @@ impl<'data> DataSource for EcdsaSign<'data> { false } } -impl<'data, W: Writer> DataStream for EcdsaSign<'data> { +impl DataStream for EcdsaSign<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2444,7 +2444,7 @@ impl<'data> Se05XResponse<'data> for EcdsaSignResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for EcdsaSign<'data> { +impl Se05XCommand for EcdsaSign<'_> { type Response<'rdata> = EcdsaSignResponse<'rdata>; } @@ -2459,7 +2459,7 @@ pub struct EddsaSign<'data> { pub data: &'data [u8], } -impl<'data> DataSource for EddsaSign<'data> { +impl DataSource for EddsaSign<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, EdDsaSignatureAlgo::Pure); @@ -2480,7 +2480,7 @@ impl<'data> DataSource for EddsaSign<'data> { false } } -impl<'data, W: Writer> DataStream for EddsaSign<'data> { +impl DataStream for EddsaSign<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, EdDsaSignatureAlgo::Pure); @@ -2512,7 +2512,7 @@ impl<'data> Se05XResponse<'data> for EddsaSignResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for EddsaSign<'data> { +impl Se05XCommand for EddsaSign<'_> { type Response<'rdata> = EddsaSignResponse<'rdata>; } @@ -2603,7 +2603,7 @@ pub struct EcdsaVerify<'data> { pub signature: &'data [u8], } -impl<'data> DataSource for EcdsaVerify<'data> { +impl DataSource for EcdsaVerify<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2619,7 +2619,7 @@ impl<'data> DataSource for EcdsaVerify<'data> { false } } -impl<'data, W: Writer> DataStream for EcdsaVerify<'data> { +impl DataStream for EcdsaVerify<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2646,7 +2646,7 @@ impl<'data> Se05XResponse<'data> for EcdsaVerifyResponse { } } -impl<'data, W: Writer> Se05XCommand for EcdsaVerify<'data> { +impl Se05XCommand for EcdsaVerify<'_> { type Response<'rdata> = EcdsaVerifyResponse; } @@ -2663,7 +2663,7 @@ pub struct EddsaVerify<'data> { pub signature: &'data [u8], } -impl<'data> DataSource for EddsaVerify<'data> { +impl DataSource for EddsaVerify<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, EdDsaSignatureAlgo::Pure); @@ -2679,7 +2679,7 @@ impl<'data> DataSource for EddsaVerify<'data> { false } } -impl<'data, W: Writer> DataStream for EddsaVerify<'data> { +impl DataStream for EddsaVerify<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, EdDsaSignatureAlgo::Pure); @@ -2706,7 +2706,7 @@ impl<'data> Se05XResponse<'data> for EddsaVerifyResponse { } } -impl<'data, W: Writer> Se05XCommand for EddsaVerify<'data> { +impl Se05XCommand for EddsaVerify<'_> { type Response<'rdata> = EddsaVerifyResponse; } @@ -2721,7 +2721,7 @@ pub struct EcdhGenerateSharedSecret<'data> { pub public_key: &'data [u8], } -impl<'data> DataSource for EcdhGenerateSharedSecret<'data> { +impl DataSource for EcdhGenerateSharedSecret<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let public_key = &Tlv::new(TAG_2, self.public_key); @@ -2741,7 +2741,7 @@ impl<'data> DataSource for EcdhGenerateSharedSecret<'data> { false } } -impl<'data, W: Writer> DataStream for EcdhGenerateSharedSecret<'data> { +impl DataStream for EcdhGenerateSharedSecret<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let public_key = &Tlv::new(TAG_2, self.public_key); @@ -2772,7 +2772,7 @@ impl<'data> Se05XResponse<'data> for EcdhGenerateSharedSecretResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for EcdhGenerateSharedSecret<'data> { +impl Se05XCommand for EcdhGenerateSharedSecret<'_> { type Response<'rdata> = EcdhGenerateSharedSecretResponse<'rdata>; } @@ -2789,7 +2789,7 @@ pub struct RsaSign<'data> { pub data: &'data [u8], } -impl<'data> DataSource for RsaSign<'data> { +impl DataSource for RsaSign<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2810,7 +2810,7 @@ impl<'data> DataSource for RsaSign<'data> { false } } -impl<'data, W: Writer> DataStream for RsaSign<'data> { +impl DataStream for RsaSign<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2842,7 +2842,7 @@ impl<'data> Se05XResponse<'data> for RsaSignResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for RsaSign<'data> { +impl Se05XCommand for RsaSign<'_> { type Response<'rdata> = RsaSignResponse<'rdata>; } @@ -2861,7 +2861,7 @@ pub struct RsaVerify<'data> { pub signature: &'data [u8], } -impl<'data> DataSource for RsaVerify<'data> { +impl DataSource for RsaVerify<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2877,7 +2877,7 @@ impl<'data> DataSource for RsaVerify<'data> { false } } -impl<'data, W: Writer> DataStream for RsaVerify<'data> { +impl DataStream for RsaVerify<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2904,7 +2904,7 @@ impl<'data> Se05XResponse<'data> for RsaVerifyResponse { } } -impl<'data, W: Writer> Se05XCommand for RsaVerify<'data> { +impl Se05XCommand for RsaVerify<'_> { type Response<'rdata> = RsaVerifyResponse; } @@ -2921,7 +2921,7 @@ pub struct RsaEncrypt<'data> { pub plaintext: &'data [u8], } -impl<'data> DataSource for RsaEncrypt<'data> { +impl DataSource for RsaEncrypt<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2942,7 +2942,7 @@ impl<'data> DataSource for RsaEncrypt<'data> { false } } -impl<'data, W: Writer> DataStream for RsaEncrypt<'data> { +impl DataStream for RsaEncrypt<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -2974,7 +2974,7 @@ impl<'data> Se05XResponse<'data> for RsaEncryptResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for RsaEncrypt<'data> { +impl Se05XCommand for RsaEncrypt<'_> { type Response<'rdata> = RsaEncryptResponse<'rdata>; } @@ -2991,7 +2991,7 @@ pub struct RsaDecrypt<'data> { pub ciphertext: &'data [u8], } -impl<'data> DataSource for RsaDecrypt<'data> { +impl DataSource for RsaDecrypt<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3012,7 +3012,7 @@ impl<'data> DataSource for RsaDecrypt<'data> { false } } -impl<'data, W: Writer> DataStream for RsaDecrypt<'data> { +impl DataStream for RsaDecrypt<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3044,7 +3044,7 @@ impl<'data> Se05XResponse<'data> for RsaDecryptResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for RsaDecrypt<'data> { +impl Se05XCommand for RsaDecrypt<'_> { type Response<'rdata> = RsaDecryptResponse<'rdata>; } @@ -3062,7 +3062,7 @@ pub struct CipherEncryptInit<'data> { pub initialization_vector: Option<&'data [u8]>, } -impl<'data> DataSource for CipherEncryptInit<'data> { +impl DataSource for CipherEncryptInit<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let cipher_id = &Tlv::new(TAG_2, self.cipher_id); @@ -3076,7 +3076,7 @@ impl<'data> DataSource for CipherEncryptInit<'data> { false } } -impl<'data, W: Writer> DataStream for CipherEncryptInit<'data> { +impl DataStream for CipherEncryptInit<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let cipher_id = &Tlv::new(TAG_2, self.cipher_id); @@ -3087,7 +3087,7 @@ impl<'data, W: Writer> DataStream for CipherEncryptInit<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherEncryptInit<'data> { +impl Se05XCommand for CipherEncryptInit<'_> { type Response<'rdata> = (); } @@ -3105,7 +3105,7 @@ pub struct CipherDecryptInit<'data> { pub initialization_vector: Option<&'data [u8]>, } -impl<'data> DataSource for CipherDecryptInit<'data> { +impl DataSource for CipherDecryptInit<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let cipher_id = &Tlv::new(TAG_2, self.cipher_id); @@ -3119,7 +3119,7 @@ impl<'data> DataSource for CipherDecryptInit<'data> { false } } -impl<'data, W: Writer> DataStream for CipherDecryptInit<'data> { +impl DataStream for CipherDecryptInit<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let cipher_id = &Tlv::new(TAG_2, self.cipher_id); @@ -3130,7 +3130,7 @@ impl<'data, W: Writer> DataStream for CipherDecryptInit<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherDecryptInit<'data> { +impl Se05XCommand for CipherDecryptInit<'_> { type Response<'rdata> = (); } @@ -3147,7 +3147,7 @@ pub struct CipherUpdate<'data> { pub data: &'data [u8], } -impl<'data> DataSource for CipherUpdate<'data> { +impl DataSource for CipherUpdate<'_> { fn len(&self) -> usize { let cipher_id = &Tlv::new(TAG_2, self.cipher_id); let data = &Tlv::new(TAG_3, self.data); @@ -3167,7 +3167,7 @@ impl<'data> DataSource for CipherUpdate<'data> { false } } -impl<'data, W: Writer> DataStream for CipherUpdate<'data> { +impl DataStream for CipherUpdate<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let cipher_id = &Tlv::new(TAG_2, self.cipher_id); let data = &Tlv::new(TAG_3, self.data); @@ -3200,7 +3200,7 @@ impl<'data> Se05XResponse<'data> for CipherUpdateResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherUpdate<'data> { +impl Se05XCommand for CipherUpdate<'_> { type Response<'rdata> = CipherUpdateResponse<'rdata>; } @@ -3217,7 +3217,7 @@ pub struct CipherFinal<'data> { pub data: &'data [u8], } -impl<'data> DataSource for CipherFinal<'data> { +impl DataSource for CipherFinal<'_> { fn len(&self) -> usize { let cipher_id = &Tlv::new(TAG_2, self.cipher_id); let data = &Tlv::new(TAG_3, self.data); @@ -3237,7 +3237,7 @@ impl<'data> DataSource for CipherFinal<'data> { false } } -impl<'data, W: Writer> DataStream for CipherFinal<'data> { +impl DataStream for CipherFinal<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let cipher_id = &Tlv::new(TAG_2, self.cipher_id); let data = &Tlv::new(TAG_3, self.data); @@ -3270,7 +3270,7 @@ impl<'data> Se05XResponse<'data> for CipherFinalResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherFinal<'data> { +impl Se05XCommand for CipherFinal<'_> { type Response<'rdata> = CipherFinalResponse<'rdata>; } @@ -3290,7 +3290,7 @@ pub struct CipherOneShotEncrypt<'data> { pub initialization_vector: Option<&'data [u8]>, } -impl<'data> DataSource for CipherOneShotEncrypt<'data> { +impl DataSource for CipherOneShotEncrypt<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let mode = &Tlv::new(TAG_2, self.mode); @@ -3312,7 +3312,7 @@ impl<'data> DataSource for CipherOneShotEncrypt<'data> { false } } -impl<'data, W: Writer> DataStream for CipherOneShotEncrypt<'data> { +impl DataStream for CipherOneShotEncrypt<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let mode = &Tlv::new(TAG_2, self.mode); @@ -3345,7 +3345,7 @@ impl<'data> Se05XResponse<'data> for CipherOneShotEncryptResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherOneShotEncrypt<'data> { +impl Se05XCommand for CipherOneShotEncrypt<'_> { type Response<'rdata> = CipherOneShotEncryptResponse<'rdata>; } @@ -3365,7 +3365,7 @@ pub struct CipherOneShotDecrypt<'data> { pub initialization_vector: Option<&'data [u8]>, } -impl<'data> DataSource for CipherOneShotDecrypt<'data> { +impl DataSource for CipherOneShotDecrypt<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let mode = &Tlv::new(TAG_2, self.mode); @@ -3387,7 +3387,7 @@ impl<'data> DataSource for CipherOneShotDecrypt<'data> { false } } -impl<'data, W: Writer> DataStream for CipherOneShotDecrypt<'data> { +impl DataStream for CipherOneShotDecrypt<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let mode = &Tlv::new(TAG_2, self.mode); @@ -3420,7 +3420,7 @@ impl<'data> Se05XResponse<'data> for CipherOneShotDecryptResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for CipherOneShotDecrypt<'data> { +impl Se05XCommand for CipherOneShotDecrypt<'_> { type Response<'rdata> = CipherOneShotDecryptResponse<'rdata>; } @@ -3511,7 +3511,7 @@ pub struct MacUpdate<'data> { pub mac_id: CryptoObjectId, } -impl<'data> DataSource for MacUpdate<'data> { +impl DataSource for MacUpdate<'_> { fn len(&self) -> usize { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3524,7 +3524,7 @@ impl<'data> DataSource for MacUpdate<'data> { false } } -impl<'data, W: Writer> DataStream for MacUpdate<'data> { +impl DataStream for MacUpdate<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3534,7 +3534,7 @@ impl<'data, W: Writer> DataStream for MacUpdate<'data> { } } -impl<'data, W: Writer> Se05XCommand for MacUpdate<'data> { +impl Se05XCommand for MacUpdate<'_> { type Response<'rdata> = (); } @@ -3549,7 +3549,7 @@ pub struct MacGenerateFinal<'data> { pub mac_id: CryptoObjectId, } -impl<'data> DataSource for MacGenerateFinal<'data> { +impl DataSource for MacGenerateFinal<'_> { fn len(&self) -> usize { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3569,7 +3569,7 @@ impl<'data> DataSource for MacGenerateFinal<'data> { false } } -impl<'data, W: Writer> DataStream for MacGenerateFinal<'data> { +impl DataStream for MacGenerateFinal<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3600,7 +3600,7 @@ impl<'data> Se05XResponse<'data> for MacGenerateFinalResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for MacGenerateFinal<'data> { +impl Se05XCommand for MacGenerateFinal<'_> { type Response<'rdata> = MacGenerateFinalResponse<'rdata>; } @@ -3619,7 +3619,7 @@ pub struct MacValidateFinal<'data> { pub tag: &'data [u8], } -impl<'data> DataSource for MacValidateFinal<'data> { +impl DataSource for MacValidateFinal<'_> { fn len(&self) -> usize { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3640,7 +3640,7 @@ impl<'data> DataSource for MacValidateFinal<'data> { false } } -impl<'data, W: Writer> DataStream for MacValidateFinal<'data> { +impl DataStream for MacValidateFinal<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let data = &Tlv::new(TAG_1, self.data); let mac_id = &Tlv::new(TAG_2, self.mac_id); @@ -3672,7 +3672,7 @@ impl<'data> Se05XResponse<'data> for MacValidateFinalResponse { } } -impl<'data, W: Writer> Se05XCommand for MacValidateFinal<'data> { +impl Se05XCommand for MacValidateFinal<'_> { type Response<'rdata> = MacValidateFinalResponse; } @@ -3689,7 +3689,7 @@ pub struct MacOneShotGenerate<'data> { pub data: &'data [u8], } -impl<'data> DataSource for MacOneShotGenerate<'data> { +impl DataSource for MacOneShotGenerate<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3710,7 +3710,7 @@ impl<'data> DataSource for MacOneShotGenerate<'data> { false } } -impl<'data, W: Writer> DataStream for MacOneShotGenerate<'data> { +impl DataStream for MacOneShotGenerate<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3742,7 +3742,7 @@ impl<'data> Se05XResponse<'data> for MacOneShotGenerateResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for MacOneShotGenerate<'data> { +impl Se05XCommand for MacOneShotGenerate<'_> { type Response<'rdata> = MacOneShotGenerateResponse<'rdata>; } @@ -3763,7 +3763,7 @@ pub struct MacOneShotValidate<'data> { pub tag: &'data [u8], } -impl<'data> DataSource for MacOneShotValidate<'data> { +impl DataSource for MacOneShotValidate<'_> { fn len(&self) -> usize { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3785,7 +3785,7 @@ impl<'data> DataSource for MacOneShotValidate<'data> { false } } -impl<'data, W: Writer> DataStream for MacOneShotValidate<'data> { +impl DataStream for MacOneShotValidate<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let key_id = &Tlv::new(TAG_1, self.key_id); let algo = &Tlv::new(TAG_2, self.algo); @@ -3818,7 +3818,7 @@ impl<'data> Se05XResponse<'data> for MacOneShotValidateResponse { } } -impl<'data, W: Writer> Se05XCommand for MacOneShotValidate<'data> { +impl Se05XCommand for MacOneShotValidate<'_> { type Response<'rdata> = MacOneShotValidateResponse; } @@ -3845,7 +3845,7 @@ pub struct Hkdf<'data> { pub requested_len: Be, } -impl<'data> DataSource for Hkdf<'data> { +impl DataSource for Hkdf<'_> { fn len(&self) -> usize { let ikm = &Tlv::new(TAG_1, self.ikm); let digest = &Tlv::new(TAG_2, self.digest); @@ -3868,7 +3868,7 @@ impl<'data> DataSource for Hkdf<'data> { false } } -impl<'data, W: Writer> DataStream for Hkdf<'data> { +impl DataStream for Hkdf<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let ikm = &Tlv::new(TAG_1, self.ikm); let digest = &Tlv::new(TAG_2, self.digest); @@ -3902,7 +3902,7 @@ impl<'data> Se05XResponse<'data> for HkdfResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for Hkdf<'data> { +impl Se05XCommand for Hkdf<'_> { type Response<'rdata> = HkdfResponse<'rdata>; } @@ -3928,7 +3928,7 @@ pub struct Pbkdf2<'data> { pub requested_len: Be, } -impl<'data> DataSource for Pbkdf2<'data> { +impl DataSource for Pbkdf2<'_> { fn len(&self) -> usize { let password = &Tlv::new(TAG_1, self.password); let salt = &self.salt.map(|data| Tlv::new(TAG_2, data)); @@ -3950,7 +3950,7 @@ impl<'data> DataSource for Pbkdf2<'data> { false } } -impl<'data, W: Writer> DataStream for Pbkdf2<'data> { +impl DataStream for Pbkdf2<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let password = &Tlv::new(TAG_1, self.password); let salt = &self.salt.map(|data| Tlv::new(TAG_2, data)); @@ -3983,7 +3983,7 @@ impl<'data> Se05XResponse<'data> for Pbkdf2Response<'data> { } } -impl<'data, W: Writer> Se05XCommand for Pbkdf2<'data> { +impl Se05XCommand for Pbkdf2<'_> { type Response<'rdata> = Pbkdf2Response<'rdata>; } @@ -4032,7 +4032,7 @@ pub struct DigestUpdate<'data> { pub data: &'data [u8], } -impl<'data> DataSource for DigestUpdate<'data> { +impl DataSource for DigestUpdate<'_> { fn len(&self) -> usize { let digest_id = &Tlv::new(TAG_2, self.digest_id); let data = &Tlv::new(TAG_3, self.data); @@ -4045,7 +4045,7 @@ impl<'data> DataSource for DigestUpdate<'data> { false } } -impl<'data, W: Writer> DataStream for DigestUpdate<'data> { +impl DataStream for DigestUpdate<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let digest_id = &Tlv::new(TAG_2, self.digest_id); let data = &Tlv::new(TAG_3, self.data); @@ -4055,7 +4055,7 @@ impl<'data, W: Writer> DataStream for DigestUpdate<'data> { } } -impl<'data, W: Writer> Se05XCommand for DigestUpdate<'data> { +impl Se05XCommand for DigestUpdate<'_> { type Response<'rdata> = (); } @@ -4070,7 +4070,7 @@ pub struct DigestFinal<'data> { pub data: &'data [u8], } -impl<'data> DataSource for DigestFinal<'data> { +impl DataSource for DigestFinal<'_> { fn len(&self) -> usize { let digest_id = &Tlv::new(TAG_2, self.digest_id); let data = &Tlv::new(TAG_3, self.data); @@ -4090,7 +4090,7 @@ impl<'data> DataSource for DigestFinal<'data> { false } } -impl<'data, W: Writer> DataStream for DigestFinal<'data> { +impl DataStream for DigestFinal<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let digest_id = &Tlv::new(TAG_2, self.digest_id); let data = &Tlv::new(TAG_3, self.data); @@ -4121,7 +4121,7 @@ impl<'data> Se05XResponse<'data> for DigestFinalResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for DigestFinal<'data> { +impl Se05XCommand for DigestFinal<'_> { type Response<'rdata> = DigestFinalResponse<'rdata>; } @@ -4136,7 +4136,7 @@ pub struct DigestOneShot<'data> { pub data: &'data [u8], } -impl<'data> DataSource for DigestOneShot<'data> { +impl DataSource for DigestOneShot<'_> { fn len(&self) -> usize { let algo = &Tlv::new(TAG_1, self.algo); let data = &Tlv::new(TAG_2, self.data); @@ -4156,7 +4156,7 @@ impl<'data> DataSource for DigestOneShot<'data> { false } } -impl<'data, W: Writer> DataStream for DigestOneShot<'data> { +impl DataStream for DigestOneShot<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { let algo = &Tlv::new(TAG_1, self.algo); let data = &Tlv::new(TAG_2, self.data); @@ -4187,7 +4187,7 @@ impl<'data> Se05XResponse<'data> for DigestOneShotResponse<'data> { } } -impl<'data, W: Writer> Se05XCommand for DigestOneShot<'data> { +impl Se05XCommand for DigestOneShot<'_> { type Response<'rdata> = DigestOneShotResponse<'rdata>; } diff --git a/src/se05x/constants.rs b/src/se05x/constants.rs index cc870e4..a3bdfdd 100644 --- a/src/se05x/constants.rs +++ b/src/se05x/constants.rs @@ -1438,7 +1438,6 @@ pub const WAP_WSG_IDM_ECID_WTLS12: CurveConstants = CurveConstants { /// IPSec/IKE/Oakley curve #3 over a 155 bit binary field. /// Not suitable for ECDSA. /// Questionable extension field! - pub const OAKLEY_EC2N_3: CurveConstants = CurveConstants { prime: &hex!("0800000000000000000000004000000000000001"), a: &hex!("0000000000000000000000000000000000000000"), diff --git a/src/se05x/policies.rs b/src/se05x/policies.rs index 3bc72aa..51adb12 100644 --- a/src/se05x/policies.rs +++ b/src/se05x/policies.rs @@ -118,7 +118,7 @@ impl Policy { #[derive(Clone, Copy, PartialEq, Eq, Debug)] pub struct PolicySet<'a>(pub &'a [Policy]); -impl<'a> PolicySet<'a> { +impl PolicySet<'_> { pub fn to_bytes(self, buffer: &mut [u8]) -> Option<&[u8]> { let mut offset = 0; for i in self.0 { @@ -136,13 +136,13 @@ impl<'a> PolicySet<'a> { } } -impl<'a> DataSource for PolicySet<'a> { +impl DataSource for PolicySet<'_> { fn len(&self) -> usize { self.0.iter().map(|p| p.to_bytes().len() + 1).sum() } } -impl<'a, W: Writer> DataStream for PolicySet<'a> { +impl DataStream for PolicySet<'_> { fn to_writer(&self, writer: &mut W) -> Result<(), ::Error> { for p in self.0 { let b = p.to_bytes(); diff --git a/src/t1.rs b/src/t1.rs index 8dab901..1cb4ed0 100644 --- a/src/t1.rs +++ b/src/t1.rs @@ -40,7 +40,7 @@ pub struct Atr<'a> { pub historical_bytes: &'a [u8], } -impl<'a> Default for Atr<'a> { +impl Default for Atr<'_> { fn default() -> Self { Self { pver: 1, @@ -809,7 +809,7 @@ impl<'writer, Twi: I2CForT1, D: DelayUs> FrameSender<'writer, Twi, D> { } } -impl<'writer, Twi: I2CForT1, D: DelayUs> Writer for FrameSender<'writer, Twi, D> { +impl> Writer for FrameSender<'_, Twi, D> { type Error = Error; fn write(&mut self, data: &[u8]) -> Result { self.write_data(data)