2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libssl/bs_cbs.c b/src/lib/libssl/bs_cbs.c
index ea31cfc530..d45353a890 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.15 2015/06/20 01:21:51 doug Exp $        */
+/*      $OpenBSD: bs_cbs.c,v 1.16 2015/06/23 05:58:28 doug Exp $        */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -36,6 +36,7 @@ void
 CBS_dup(const CBS *cbs, CBS *out)
 {
         CBS_init(out, CBS_data(cbs), CBS_len(cbs));
+        out->initial_len = cbs->initial_len;
 }
 
 static int
diff --git a/src/lib/libssl/src/ssl/bs_cbs.c b/src/lib/libssl/src/ssl/bs_cbs.c
index ea31cfc530..d45353a890 100644
--- a/src/lib/libssl/src/ssl/bs_cbs.c
+++ b/src/lib/libssl/src/ssl/bs_cbs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bs_cbs.c,v 1.15 2015/06/20 01:21:51 doug Exp $        */
+/*      $OpenBSD: bs_cbs.c,v 1.16 2015/06/23 05:58:28 doug Exp $        */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -36,6 +36,7 @@ void
 CBS_dup(const CBS *cbs, CBS *out)
 {
         CBS_init(out, CBS_data(cbs), CBS_len(cbs));
+        out->initial_len = cbs->initial_len;
 }
 
 static int