3 files changed, 41 insertions, 3 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
diff --git a/src/regress/lib/libssl/bytestring/bytestringtest.c b/src/regress/lib/libssl/bytestring/bytestringtest.c
index d989868c85..3275e6f2c7 100644
--- a/src/regress/lib/libssl/bytestring/bytestringtest.c
+++ b/src/regress/lib/libssl/bytestring/bytestringtest.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bytestringtest.c,v 1.7 2015/06/23 01:20:24 doug Exp $ */
+/*      $OpenBSD: bytestringtest.c,v 1.8 2015/06/23 05:58:28 doug Exp $ */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -751,6 +751,41 @@ err:
         return ret;
 }
 
+static int
+test_cbs_dup(void)
+{
+        CBS data, check;
+        static const uint8_t input[] = {'f', 'o', 'o', 'b', 'a', 'r'};
+
+        CBS_init(&data, input, sizeof(input));
+        CHECK(CBS_len(&data) == 6);
+        CBS_dup(&data, &check);
+        CHECK(CBS_len(&check) == 6);
+        CHECK(CBS_data(&data) == CBS_data(&check));
+        CHECK(CBS_skip(&data, 1));
+        CHECK(CBS_len(&data) == 5);
+        CHECK(CBS_len(&check) == 6);
+        CHECK(CBS_data(&data) == CBS_data(&check) + 1);
+        CHECK(CBS_skip(&check, 1));
+        CHECK(CBS_len(&data) == 5);
+        CHECK(CBS_len(&check) == 5);
+        CHECK(CBS_data(&data) == CBS_data(&check));
+        CHECK(CBS_offset(&data) == 1);
+        CHECK(CBS_offset(&check) == 1);
+
+        CBS_init(&data, input, sizeof(input));
+        CHECK(CBS_skip(&data, 5));
+        CBS_dup(&data, &check);
+        CHECK(CBS_len(&data) == 1);
+        CHECK(CBS_len(&check) == 1);
+        CHECK(CBS_data(&data) == input + 5);
+        CHECK(CBS_data(&data) == CBS_data(&check));
+        CHECK(CBS_offset(&data) == 5);
+        CHECK(CBS_offset(&check) == 5);
+
+        return 1;
+}
+
 int
 main(void)
 {
@@ -772,6 +807,7 @@ main(void)
         failed |= !test_get_optional_asn1_bool();
         failed |= !test_offset();
         failed |= !test_write_bytes();
+        failed |= !test_cbs_dup();
 
         if (!failed)
                 printf("PASS\n");