From 8b42b5407581a1d4073ee51a3341d38b231334b3 Mon Sep 17 00:00:00 2001
From: Niklas Saari <niklas.saari@tutanota.com>
Date: Fri, 29 Nov 2024 15:56:01 +0200
Subject: [PATCH] perf: oer: format! in error messages has too much impact
 (#387)

---
 src/error/decode.rs |  4 ++--
 src/oer/de.rs       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/error/decode.rs b/src/error/decode.rs
index ee0c4b30..7aef1dd5 100644
--- a/src/error/decode.rs
+++ b/src/error/decode.rs
@@ -518,9 +518,9 @@ pub enum DecodeErrorKind {
     },
 
     /// Input is provided as BIT slice for nom in UPER/APER.
-    /// On BER/CER/DER it is as BYTE slice.
+    /// On BER/CER/DER/OER/COER it is a BYTE slice.
     /// Hence, `needed` field can describe either bits or bytes depending on the codec.
-    #[snafu(display("Need more BITS to continue: ({:?}).", needed))]
+    #[snafu(display("Need more data to continue: ({:?}).", needed))]
     Incomplete {
         /// Amount of bits/bytes needed.
         needed: nom::Needed,
diff --git a/src/oer/de.rs b/src/oer/de.rs
index 7906f4c2..6486da15 100644
--- a/src/oer/de.rs
+++ b/src/oer/de.rs
@@ -11,7 +11,11 @@ use alloc::{
     vec::Vec,
 };
 
+use core::num::NonZeroUsize;
+use nom::Needed;
+
 use crate::{
+    de::{Decode, Error as _},
     oer::EncodingRules,
     types::{
         self,
@@ -20,7 +24,7 @@ use crate::{
         GeneralString, GeneralizedTime, Ia5String, IntegerType, NumericString, ObjectIdentifier,
         PrintableString, SetOf, Tag, TeletexString, UtcTime, VisibleString,
     },
-    Codec, Decode,
+    Codec,
 };
 
 use bitvec::{order::Msb0, view::BitView};
@@ -190,7 +194,6 @@ impl<'input, const RFC: usize, const EFC: usize> Decoder<'input, RFC, EFC> {
     }
 
     /// Extracts data from input by length and updates the input
-    /// Since we rely on memory and `BitSlice`, we cannot handle larger data length than `0x1fff_ffff_ffff_ffff`
     /// 'length' is the length of the data in bytes (octets)
     /// Returns the data
     fn extract_data_by_length(&mut self, length: usize) -> Result<&'input [u8], DecodeError> {
@@ -198,11 +201,8 @@ impl<'input, const RFC: usize, const EFC: usize> Decoder<'input, RFC, EFC> {
             return Ok(&[]);
         }
         let (data, rest) = self.input.split_at_checked(length).ok_or_else(|| {
-            DecodeError::parser_fail(
-                alloc::format!(
-                    "Unexpected end of data when parsing &[u8] with length {}",
-                    length
-                ),
+            DecodeError::incomplete(
+                Needed::Size(NonZeroUsize::new(length - self.input.len()).unwrap()),
                 self.codec(),
             )
         })?;