edition: 2021 -> 2024

Author: newAM

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 - Add missing implementation to support Client Certificate Authorization (#135)
+- Changed edition from 2021 to 2024.
 
 ## 0.17.0 - 2024-01-06
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "embedded-tls"
 version = "0.17.1"
-edition = "2021"
+edition = "2024"
 description = "TLS 1.3 client with no_std support and no allocator"
 documentation = "https://docs.rs/embedded-tls"
 readme = "README.md"

src/alert.rs

@@ -1,6 +1,6 @@
+use crate::TlsError;
 use crate::buffer::CryptoBuffer;
 use crate::parse_buffer::ParseBuffer;
-use crate::TlsError;
 
 #[derive(Debug, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/asynch.rs

@@ -1,15 +1,15 @@
 use core::sync::atomic::{AtomicBool, Ordering};
 
+use crate::TlsError;
 use crate::common::decrypted_buffer_info::DecryptedBufferInfo;
 use crate::common::decrypted_read_handler::DecryptedReadHandler;
-use crate::connection::{decrypt_record, Handshake, State};
+use crate::connection::{Handshake, State, decrypt_record};
 use crate::key_schedule::KeySchedule;
 use crate::key_schedule::{ReadKeySchedule, WriteKeySchedule};
 use crate::read_buffer::ReadBuffer;
 use crate::record::{ClientRecord, ClientRecordHeader};
 use crate::record_reader::{RecordReader, RecordReaderBorrowMut};
 use crate::write_buffer::{WriteBuffer, WriteBufferBorrowMut};
-use crate::TlsError;
 use embedded_io::Error as _;
 use embedded_io::ErrorType;
 use embedded_io_async::{BufRead, Read as AsyncRead, Write as AsyncWrite};

src/blocking.rs

@@ -2,7 +2,7 @@ use core::sync::atomic::Ordering;
 
 use crate::common::decrypted_buffer_info::DecryptedBufferInfo;
 use crate::common::decrypted_read_handler::DecryptedReadHandler;
-use crate::connection::{decrypt_record, Handshake, State};
+use crate::connection::{Handshake, State, decrypt_record};
 use crate::key_schedule::KeySchedule;
 use crate::key_schedule::{ReadKeySchedule, WriteKeySchedule};
 use crate::read_buffer::ReadBuffer;
@@ -13,8 +13,8 @@ use embedded_io::Error as _;
 use embedded_io::{BufRead, ErrorType, Read, Write};
 use portable_atomic::AtomicBool;
 
-pub use crate::config::*;
 pub use crate::TlsError;
+pub use crate::config::*;
 
 /// Type representing a TLS connection. An instance of this type can
 /// be used to establish a TLS connection, write and read encrypted data over this connection,

src/buffer.rs

@@ -1,6 +1,6 @@
 use crate::TlsError;
-use aes_gcm::aead::Buffer;
 use aes_gcm::Error;
+use aes_gcm::aead::Buffer;
 
 pub struct CryptoBuffer<'b> {
     buf: &'b mut [u8],

src/change_cipher_spec.rs

@@ -1,6 +1,6 @@
+use crate::TlsError;
 use crate::buffer::CryptoBuffer;
 use crate::parse_buffer::ParseBuffer;
-use crate::TlsError;
 
 #[derive(Debug, Copy, Clone)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/common/decrypted_read_handler.rs

@@ -1,8 +1,8 @@
 use core::ops::Range;
 
 use crate::{
-    alert::AlertDescription, common::decrypted_buffer_info::DecryptedBufferInfo,
-    config::TlsCipherSuite, handshake::ServerHandshake, record::ServerRecord, TlsError,
+    TlsError, alert::AlertDescription, common::decrypted_buffer_info::DecryptedBufferInfo,
+    config::TlsCipherSuite, handshake::ServerHandshake, record::ServerRecord,
 };
 
 pub struct DecryptedReadHandler<'a> {

src/config.rs

@@ -1,11 +1,11 @@
 use core::marker::PhantomData;
 
+use crate::TlsError;
 use crate::cipher_suites::CipherSuite;
 use crate::extensions::extension_data::signature_algorithms::SignatureScheme;
 use crate::extensions::extension_data::supported_groups::NamedGroup;
 use crate::handshake::certificate::CertificateRef;
 pub use crate::handshake::certificate_verify::CertificateVerifyRef;
-use crate::TlsError;
 use aes_gcm::{AeadInPlace, Aes128Gcm, Aes256Gcm, KeyInit};
 use digest::core_api::BlockSizeUser;
 use digest::{Digest, FixedOutput, OutputSizeUser, Reset};
@@ -273,14 +273,18 @@ impl<'a> TlsConfig<'a> {
             config = config.enable_rsa_signatures();
         }
 
-        unwrap!(config
-            .signature_schemes
-            .push(SignatureScheme::EcdsaSecp256r1Sha256)
-            .ok());
-        unwrap!(config
-            .signature_schemes
-            .push(SignatureScheme::EcdsaSecp384r1Sha384)
-            .ok());
+        unwrap!(
+            config
+                .signature_schemes
+                .push(SignatureScheme::EcdsaSecp256r1Sha256)
+                .ok()
+        );
+        unwrap!(
+            config
+                .signature_schemes
+                .push(SignatureScheme::EcdsaSecp384r1Sha384)
+                .ok()
+        );
         unwrap!(config.signature_schemes.push(SignatureScheme::Ed25519).ok());
 
         unwrap!(config.named_groups.push(NamedGroup::Secp256r1));
@@ -290,30 +294,36 @@ impl<'a> TlsConfig<'a> {
 
     /// Enable RSA ciphers even if they might not be supported.
     pub fn enable_rsa_signatures(mut self) -> Self {
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPkcs1Sha256)
-            .ok());
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPkcs1Sha384)
-            .ok());
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPkcs1Sha512)
-            .ok());
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPssRsaeSha256)
-            .ok());
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPssRsaeSha384)
-            .ok());
-        unwrap!(self
-            .signature_schemes
-            .push(SignatureScheme::RsaPssRsaeSha512)
-            .ok());
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPkcs1Sha256)
+                .ok()
+        );
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPkcs1Sha384)
+                .ok()
+        );
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPkcs1Sha512)
+                .ok()
+        );
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPssRsaeSha256)
+                .ok()
+        );
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPssRsaeSha384)
+                .ok()
+        );
+        unwrap!(
+            self.signature_schemes
+                .push(SignatureScheme::RsaPssRsaeSha512)
+                .ok()
+        );
         self
     }
 

src/connection.rs

@@ -4,11 +4,11 @@ use crate::key_schedule::{KeySchedule, ReadKeySchedule, WriteKeySchedule};
 use crate::record::{ClientRecord, ServerRecord};
 use crate::record_reader::RecordReader;
 use crate::write_buffer::WriteBuffer;
+use crate::{CertificateVerify, CryptoProvider, TlsError, TlsVerifier};
 use crate::{
     alert::{Alert, AlertDescription, AlertLevel},
     handshake::{certificate::CertificateRef, certificate_request::CertificateRequest},
 };
-use crate::{CertificateVerify, CryptoProvider, TlsError, TlsVerifier};
 use core::fmt::Debug;
 use digest::Digest;
 use embedded_io::Error as _;

src/extensions/extension_data/key_share.rs

@@ -3,8 +3,8 @@ use heapless::Vec;
 use crate::buffer::CryptoBuffer;
 use crate::extensions::extension_data::supported_groups::NamedGroup;
 
-use crate::parse_buffer::{ParseBuffer, ParseError};
 use crate::TlsError;
+use crate::parse_buffer::{ParseBuffer, ParseError};
 
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/extensions/extension_data/max_fragment_length.rs

@@ -1,7 +1,7 @@
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 /// Maximum plaintext fragment length

src/extensions/extension_data/pre_shared_key.rs

@@ -1,7 +1,7 @@
 use crate::buffer::CryptoBuffer;
 
-use crate::parse_buffer::{ParseBuffer, ParseError};
 use crate::TlsError;
+use crate::parse_buffer::{ParseBuffer, ParseError};
 
 use heapless::Vec;
 

src/extensions/extension_data/psk_key_exchange_modes.rs

@@ -1,7 +1,7 @@
 use crate::buffer::CryptoBuffer;
 
-use crate::parse_buffer::{ParseBuffer, ParseError};
 use crate::TlsError;
+use crate::parse_buffer::{ParseBuffer, ParseError};
 
 use heapless::Vec;
 

src/extensions/extension_data/server_name.rs

@@ -1,10 +1,10 @@
 use heapless::Vec;
 
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     extensions::ExtensionType,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq)]

src/extensions/extension_data/signature_algorithms.rs

@@ -1,7 +1,7 @@
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 use heapless::Vec;

src/extensions/extension_data/signature_algorithms_cert.rs

@@ -1,8 +1,8 @@
 use crate::buffer::CryptoBuffer;
 use crate::extensions::extension_data::signature_algorithms::SignatureScheme;
 
-use crate::parse_buffer::{ParseBuffer, ParseError};
 use crate::TlsError;
+use crate::parse_buffer::{ParseBuffer, ParseError};
 
 use heapless::Vec;
 

src/extensions/extension_data/supported_groups.rs

@@ -1,9 +1,9 @@
 use heapless::Vec;
 
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 #[derive(Copy, Clone, Debug, PartialEq)]

src/extensions/extension_data/supported_versions.rs

@@ -1,7 +1,7 @@
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 use heapless::Vec;
 

src/extensions/extension_data/unimplemented.rs

@@ -1,7 +1,7 @@
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 #[derive(Debug, Clone, PartialEq)]

src/extensions/mod.rs

@@ -1,7 +1,7 @@
 use crate::{
+    TlsError,
     buffer::CryptoBuffer,
     parse_buffer::{ParseBuffer, ParseError},
-    TlsError,
 };
 
 mod extension_group_macro;

src/handshake/binder.rs

@@ -1,5 +1,5 @@
-use crate::buffer::CryptoBuffer;
 use crate::TlsError;
+use crate::buffer::CryptoBuffer;
 use core::fmt::{Debug, Formatter};
 //use digest::generic_array::{ArrayLength, GenericArray};
 use generic_array::{ArrayLength, GenericArray};

src/handshake/certificate.rs

@@ -1,7 +1,7 @@
+use crate::TlsError;
 use crate::buffer::CryptoBuffer;
 use crate::extensions::messages::CertificateExtension;
 use crate::parse_buffer::ParseBuffer;
-use crate::TlsError;
 use heapless::Vec;
 
 #[derive(Debug)]

src/handshake/certificate_request.rs

@@ -1,6 +1,6 @@
 use crate::extensions::messages::CertificateRequestExtension;
 use crate::parse_buffer::ParseBuffer;
-use crate::{unused, TlsError};
+use crate::{TlsError, unused};
 use heapless::Vec;
 
 #[derive(Debug)]

src/handshake/certificate_verify.rs

@@ -1,6 +1,6 @@
+use crate::TlsError;
 use crate::extensions::extension_data::signature_algorithms::SignatureScheme;
 use crate::parse_buffer::ParseBuffer;
-use crate::TlsError;
 
 use super::CryptoBuffer;
 

src/handshake/client_hello.rs

@@ -2,11 +2,12 @@ use core::marker::PhantomData;
 
 use digest::{Digest, OutputSizeUser};
 use heapless::Vec;
+use p256::EncodedPoint;
 use p256::ecdh::EphemeralSecret;
 use p256::elliptic_curve::rand_core::RngCore;
-use p256::EncodedPoint;
 use typenum::Unsigned;
 
+use crate::TlsError;
 use crate::config::{TlsCipherSuite, TlsConfig};
 use crate::extensions::extension_data::key_share::{KeyShareClientHello, KeyShareEntry};
 use crate::extensions::extension_data::pre_shared_key::PreSharedKeyClientHello;
@@ -18,10 +19,9 @@ use crate::extensions::extension_data::signature_algorithms::SignatureAlgorithms
 use crate::extensions::extension_data::supported_groups::{NamedGroup, SupportedGroups};
 use crate::extensions::extension_data::supported_versions::{SupportedVersionsClientHello, TLS13};
 use crate::extensions::messages::ClientHelloExtension;
-use crate::handshake::{Random, LEGACY_VERSION};
+use crate::handshake::{LEGACY_VERSION, Random};
 use crate::key_schedule::{HashOutputSize, WriteKeySchedule};
-use crate::TlsError;
-use crate::{buffer::CryptoBuffer, CryptoProvider};
+use crate::{CryptoProvider, buffer::CryptoBuffer};
 
 pub struct ClientHello<'config, CipherSuite>
 where

src/handshake/encrypted_extensions.rs

@@ -2,8 +2,8 @@ use core::marker::PhantomData;
 
 use crate::extensions::messages::EncryptedExtensionsExtension;
 
-use crate::parse_buffer::ParseBuffer;
 use crate::TlsError;
+use crate::parse_buffer::ParseBuffer;
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/handshake/finished.rs

@@ -1,6 +1,6 @@
+use crate::TlsError;
 use crate::buffer::CryptoBuffer;
 use crate::parse_buffer::ParseBuffer;
-use crate::TlsError;
 use core::fmt::{Debug, Formatter};
 //use digest::generic_array::{ArrayLength, GenericArray};
 use generic_array::{ArrayLength, GenericArray};

src/handshake/mod.rs

@@ -1,4 +1,5 @@
 //use p256::elliptic_curve::AffinePoint;
+use crate::TlsError;
 use crate::config::TlsCipherSuite;
 use crate::handshake::certificate::CertificateRef;
 use crate::handshake::certificate_request::CertificateRequestRef;
@@ -10,7 +11,6 @@ use crate::handshake::new_session_ticket::NewSessionTicket;
 use crate::handshake::server_hello::ServerHello;
 use crate::key_schedule::HashOutputSize;
 use crate::parse_buffer::{ParseBuffer, ParseError};
-use crate::TlsError;
 use crate::{buffer::CryptoBuffer, key_schedule::WriteKeySchedule};
 use core::fmt::{Debug, Formatter};
 use sha2::Digest;