Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions der/src/asn1/integer/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ pub(super) fn decode_to_slice(bytes: &[u8]) -> Result<&[u8]> {
pub(super) fn decode_to_array<const N: usize>(bytes: &[u8]) -> Result<[u8; N]> {
let input = decode_to_slice(bytes)?;

// Input has leading zeroes removed, so we need to add them back
// Compute number of leading zeroes to add
let num_zeroes = N
.checked_sub(input.len())
.ok_or_else(|| Tag::Integer.length_error())?;

// Copy input into `N`-sized output buffer with leading zeroes
let mut output = [0u8; N];
output[N.saturating_sub(input.len())..].copy_from_slice(input);
output[num_zeroes..].copy_from_slice(input);
Ok(output)
}

Expand Down Expand Up @@ -69,3 +74,27 @@ pub(super) fn strip_leading_zeroes(mut bytes: &[u8]) -> &[u8] {
fn needs_leading_zero(bytes: &[u8]) -> bool {
matches!(bytes.get(0), Some(byte) if *byte >= 0x80)
}

#[cfg(test)]
mod tests {
use super::decode_to_array;
use crate::{ErrorKind, Tag};

#[test]
fn decode_to_array_no_leading_zero() {
let arr = decode_to_array::<4>(&[1, 2]).unwrap();
assert_eq!(arr, [0, 0, 1, 2]);
}

#[test]
fn decode_to_array_leading_zero() {
let arr = decode_to_array::<4>(&[0x00, 0xFF, 0xFE]).unwrap();
assert_eq!(arr, [0x00, 0x00, 0xFF, 0xFE]);
}

#[test]
fn decode_to_array_oversized_input() {
let err = decode_to_array::<1>(&[1, 2, 3]).err().unwrap();
assert_eq!(err.kind(), ErrorKind::Length { tag: Tag::Integer });
}
}