-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds support for serializing/deserializing the following types using serde: - `ScalarCore` - `NonZeroScalar` - `PublicKey` While this crate had `serde` support previously, it was entirely limited to the JWK implementation. This commit expands it to support more types, and provides the underpinnings for better leveraging `serde` in all of the dependent crates.
- Loading branch information
Showing
7 changed files
with
332 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| //! Hexadecimal encoding helpers | ||
| use crate::{Error, Result}; | ||
| use core::{fmt, str}; | ||
|
|
||
| /// Write the provided slice to the formatter as lower case hexadecimal | ||
| #[inline] | ||
| pub(crate) fn write_lower(slice: &[u8], formatter: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| for byte in slice { | ||
| write!(formatter, "{:02x}", byte)?; | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| /// Write the provided slice to the formatter as upper case hexadecimal | ||
| #[inline] | ||
| pub(crate) fn write_upper(slice: &[u8], formatter: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| for byte in slice { | ||
| write!(formatter, "{:02X}", byte)?; | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| /// Decode the provided hexadecimal string into the provided buffer. | ||
| /// | ||
| /// Accepts either lower case or upper case hexadecimal, but not mixed. | ||
| // TODO(tarcieri): constant-time hex decoder? | ||
| pub(crate) fn decode(hex: &str, out: &mut [u8]) -> Result<()> { | ||
| if hex.as_bytes().len() != out.len() * 2 { | ||
| return Err(Error); | ||
| } | ||
|
|
||
| let mut upper_case = None; | ||
|
|
||
| // Ensure all characters are valid and case is not mixed | ||
| for &byte in hex.as_bytes() { | ||
| match byte { | ||
| b'0'..=b'9' => (), | ||
| b'a'..=b'z' => match upper_case { | ||
| Some(true) => return Err(Error), | ||
| Some(false) => (), | ||
| None => upper_case = Some(false), | ||
| }, | ||
| b'A'..=b'Z' => match upper_case { | ||
| Some(true) => (), | ||
| Some(false) => return Err(Error), | ||
| None => upper_case = Some(true), | ||
| }, | ||
| _ => return Err(Error), | ||
| } | ||
| } | ||
|
|
||
| for (digit, byte) in hex.as_bytes().chunks_exact(2).zip(out.iter_mut()) { | ||
| *byte = str::from_utf8(digit) | ||
| .ok() | ||
| .and_then(|s| u8::from_str_radix(s, 16).ok()) | ||
| .ok_or(Error)?; | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| #[cfg(all(test, feature = "std"))] | ||
| mod tests { | ||
| use core::fmt; | ||
| use hex_literal::hex; | ||
|
|
||
| const EXAMPLE_DATA: &[u8] = &hex!("0123456789ABCDEF"); | ||
| const EXAMPLE_HEX_LOWER: &str = "0123456789abcdef"; | ||
| const EXAMPLE_HEX_UPPER: &str = "0123456789ABCDEF"; | ||
|
|
||
| struct Wrapper<'a>(&'a [u8]); | ||
|
|
||
| impl fmt::LowerHex for Wrapper<'_> { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| super::write_lower(self.0, f) | ||
| } | ||
| } | ||
|
|
||
| impl fmt::UpperHex for Wrapper<'_> { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| super::write_upper(self.0, f) | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn decode_lower() { | ||
| let mut buf = [0u8; 8]; | ||
| super::decode(EXAMPLE_HEX_LOWER, &mut buf).unwrap(); | ||
| assert_eq!(buf, EXAMPLE_DATA); | ||
| } | ||
|
|
||
| #[test] | ||
| fn decode_upper() { | ||
| let mut buf = [0u8; 8]; | ||
| super::decode(EXAMPLE_HEX_LOWER, &mut buf).unwrap(); | ||
| assert_eq!(buf, EXAMPLE_DATA); | ||
| } | ||
|
|
||
| #[test] | ||
| fn decode_rejects_mixed_case() { | ||
| let mut buf = [0u8; 8]; | ||
| assert!(super::decode("0123456789abcDEF", &mut buf).is_err()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn decode_rejects_too_short() { | ||
| let mut buf = [0u8; 9]; | ||
| assert!(super::decode(EXAMPLE_HEX_LOWER, &mut buf).is_err()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn decode_rejects_too_long() { | ||
| let mut buf = [0u8; 7]; | ||
| assert!(super::decode(EXAMPLE_HEX_LOWER, &mut buf).is_err()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn encode_lower() { | ||
| assert_eq!(format!("{:x}", Wrapper(EXAMPLE_DATA)), EXAMPLE_HEX_LOWER); | ||
| } | ||
|
|
||
| #[test] | ||
| fn encode_upper() { | ||
| assert_eq!(format!("{:X}", Wrapper(EXAMPLE_DATA)), EXAMPLE_HEX_UPPER); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.