const-oid: add ObjectIdentifierRef

const-oid/src/arcs.rs

@@ -58,7 +58,8 @@ impl<'a> Arcs<'a> {
         match self.cursor {
             // Indicates we're on the root arc
             None => {
-                let root = RootArcs::try_from(self.bytes[0])?;
+                let root_byte = *self.bytes.first().ok_or(Error::Empty)?;
+                let root = RootArcs::try_from(root_byte)?;
                 self.cursor = Some(0);
                 Ok(Some(root.first_arc()))
             }

const-oid/src/db.rs

@@ -58,7 +58,7 @@ impl<'a> Database<'a> {
         while i < self.0.len() {
             let lhs = self.0[i].0;
 
-            if lhs.buffer.eq(&oid.buffer) {
+            if lhs.ber.eq(&oid.ber) {
                 return Some(self.0[i].1);
             }
 
@@ -110,7 +110,7 @@ impl<'a> Iterator for Names<'a> {
         while i < self.database.0.len() {
             let lhs = self.database.0[i].0;
 
-            if lhs.buffer.eq(&self.oid.buffer) {
+            if lhs.ber.eq(&self.oid.ber) {
                 self.position = i + 1;
                 return Some(self.database.0[i].1);
             }

const-oid/src/encoder.rs

@@ -5,29 +5,29 @@ use crate::{
     Arc, Buffer, Error, ObjectIdentifier, Result,
 };
 
-/// BER/DER encoder
+/// BER/DER encoder.
 #[derive(Debug)]
 pub(crate) struct Encoder<const MAX_SIZE: usize> {
-    /// Current state
+    /// Current state.
     state: State,
 
-    /// Bytes of the OID being encoded in-progress
+    /// Bytes of the OID being BER-encoded in-progress.
     bytes: [u8; MAX_SIZE],
 
-    /// Current position within the byte buffer
+    /// Current position within the byte buffer.
     cursor: usize,
 }
 
-/// Current state of the encoder
+/// Current state of the encoder.
 #[derive(Debug)]
 enum State {
-    /// Initial state - no arcs yet encoded
+    /// Initial state - no arcs yet encoded.
     Initial,
 
-    /// First arc parsed
+    /// First arc parsed.
     FirstArc(Arc),
 
-    /// Encoding base 128 body of the OID
+    /// Encoding base 128 body of the OID.
     Body,
 }
 
@@ -45,8 +45,8 @@ impl<const MAX_SIZE: usize> Encoder<MAX_SIZE> {
     pub(crate) const fn extend(oid: ObjectIdentifier<MAX_SIZE>) -> Self {
         Self {
             state: State::Body,
-            bytes: oid.buffer.bytes,
-            cursor: oid.buffer.length as usize,
+            bytes: oid.ber.bytes,
+            cursor: oid.ber.length as usize,
         }
     }
 
@@ -100,16 +100,16 @@ impl<const MAX_SIZE: usize> Encoder<MAX_SIZE> {
 
     /// Finish encoding an OID.
     pub(crate) const fn finish(self) -> Result<ObjectIdentifier<MAX_SIZE>> {
-        if self.cursor >= 2 {
-            let bytes = Buffer {
-                bytes: self.bytes,
-                length: self.cursor as u8,
-            };
-
-            Ok(ObjectIdentifier { buffer: bytes })
-        } else {
-            Err(Error::NotEnoughArcs)
+        if self.cursor == 0 {
+            return Err(Error::Empty);
         }
+
+        let ber = Buffer {
+            bytes: self.bytes,
+            length: self.cursor as u8,
+        };
+
+        Ok(ObjectIdentifier { ber })
     }
 
     /// Encode a single byte of a Base 128 value.

const-oid/src/error.rs

@@ -37,9 +37,6 @@ pub enum Error {
     /// OID length is invalid (too short or too long).
     Length,
 
-    /// Minimum 3 arcs required.
-    NotEnoughArcs,
-
     /// Trailing `.` character at end of input.
     TrailingDot,
 }
@@ -56,7 +53,6 @@ impl Error {
             Error::DigitExpected { .. } => panic!("OID expected to start with digit"),
             Error::Empty => panic!("OID value is empty"),
             Error::Length => panic!("OID length invalid"),
-            Error::NotEnoughArcs => panic!("OID requires minimum of 3 arcs"),
             Error::TrailingDot => panic!("OID ends with invalid trailing '.'"),
         }
     }
@@ -73,7 +69,6 @@ impl fmt::Display for Error {
             }
             Error::Empty => f.write_str("OID value is empty"),
             Error::Length => f.write_str("OID length invalid"),
-            Error::NotEnoughArcs => f.write_str("OID requires minimum of 3 arcs"),
             Error::TrailingDot => f.write_str("OID ends with invalid trailing '.'"),
         }
     }