commit f83d50ffc17a65e2c6a7abc01451c7a1f8e5ae80
author Alessandro Ghedini <alessandro@ghedini.me> Mon Nov 04 16:50:49 2019 +0000
committer Alessandro Ghedini <alessandro@ghedini.me> Mon Nov 04 17:44:11 2019 +0000
tree 509aa84f3e79d2746345fc96fc3fe6a82d2357cb
parent 855b89ec088a2d589490c9a7a1fe6e109bf7852d

packet: don't unwrap()

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 2ffc716..83fcc61 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1611,7 +1611,8 @@
         let pn_len = packet::pkt_num_len(pn)?;
 
         // The AEAD overhead at the current encryption level.
-        let overhead = self.pkt_num_spaces[epoch].overhead();
+        let overhead =
+            self.pkt_num_spaces[epoch].overhead().ok_or(Error::Done)?;
 
         let hdr = Header {
             ty: pkt_type,
@@ -3378,8 +3379,8 @@
 
         hdr.to_bytes(&mut b)?;
 
-        let payload_len =
-            frames.iter().fold(0, |acc, x| acc + x.wire_len()) + space.overhead();
+        let payload_len = frames.iter().fold(0, |acc, x| acc + x.wire_len()) +
+            space.overhead().unwrap();
 
         if pkt_type != packet::Type::Short {
             let len = pn_len + payload_len;

src/packet.rs

diff --git a/src/packet.rs b/src/packet.rs
index 494e154..6d81718 100644
--- a/src/packet.rs
+++ b/src/packet.rs
@@ -673,8 +673,8 @@
         self.ack_elicited = false;
     }
 
-    pub fn overhead(&self) -> usize {
-        self.crypto_seal.as_ref().unwrap().alg().tag_len()
+    pub fn overhead(&self) -> Option<usize> {
+        Some(self.crypto_seal.as_ref()?.alg().tag_len())
     }
 
     pub fn ready(&self) -> bool {