2 files changed, 5 insertions, 8 deletions

diff --git a/src/lib/libssl/bs_cbb.c b/src/lib/libssl/bs_cbb.c
index beb588fe25..a34e822c94 100644
--- a/src/lib/libssl/bs_cbb.c
+++ b/src/lib/libssl/bs_cbb.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bs_cbb.c,v 1.19 2018/08/16 18:39:37 jsing Exp $       */
+/*      $OpenBSD: bs_cbb.c,v 1.20 2019/01/23 22:20:40 beck Exp $        */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -14,7 +14,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -214,7 +213,8 @@ CBB_flush(CBB *cbb)
                 uint8_t initial_length_byte;
 
                 /* We already wrote 1 byte for the length. */
-                assert (cbb->pending_len_len == 1);
+                if (cbb->pending_len_len != 1)
+                        return 0;
 
                 /* Check for long form */
                 if (len > 0xfffffffe)
diff --git a/src/lib/libssl/bs_cbs.c b/src/lib/libssl/bs_cbs.c
index ea1f0108f6..5c3b9e3ec6 100644
--- a/src/lib/libssl/bs_cbs.c
+++ b/src/lib/libssl/bs_cbs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bs_cbs.c,v 1.17 2015/06/24 09:44:18 jsing Exp $       */
+/*      $OpenBSD: bs_cbs.c,v 1.18 2019/01/23 22:20:40 beck Exp $        */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -14,7 +14,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -347,10 +346,8 @@ cbs_get_asn1(CBS *cbs, CBS *out, unsigned int tag_value, int skip_header)
             tag != tag_value)
                 return 0;
 
-        if (skip_header && !CBS_skip(out, header_len)) {
-                assert(0);
+        if (skip_header && !CBS_skip(out, header_len))
                 return 0;
-        }
 
         return 1;
 }