From 424fe3a592a95234efe7ab98995c1ce5cdbd2486 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Fri, 11 Jan 2019 00:30:15 +0100
Subject: [PATCH] [386-remove-obsolete-experimental-dhcpv6-options] Removed no
 future experimental options

---
 doc/guide/dhcp6-srv.xml                  | 23 +----------------------
 src/lib/dhcp/dhcp6.h                     | 13 ++-----------
 src/lib/dhcp/std_option_defs.h           | 10 +---------
 src/lib/dhcp/tests/libdhcp++_unittest.cc | 14 +-------------
 4 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 4262ca7676..ea466ba7b9 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1462,27 +1462,6 @@ temporarily override a list of interface names and listen on all interfaces.
       options is non-functional. However, it may be useful in some
       limited lab testing, hence the definition formats are listed here.
     </para>
-
-    <para>
-      <table frame="all" xml:id="dhcp6-exp-options-list">
-        <title>List of Experimental DHCPv6 Options</title>
-        <tgroup cols="4">
-        <colspec colname="name"/>
-        <colspec colname="code" align="center"/>
-        <colspec colname="type" align="center"/>
-        <colspec colname="array" align="center"/>
-        <thead>
-          <row><entry>Name</entry><entry>Code</entry><entry>Type</entry><entry>Array?</entry></row>
-        </thead>
-        <tbody>
-<row><entry>public-key</entry><entry>701</entry><entry>hex</entry><entry>false</entry></row>
-<row><entry>certificate</entry><entry>702</entry><entry>hex</entry><entry>false</entry></row>
-<row><entry>signature</entry><entry>703</entry><entry>record (uint8, uint8, hex)</entry><entry>false</entry></row>
-<row><entry>timestamp</entry><entry>704</entry><entry>hex</entry><entry>false</entry></row>
-        </tbody>
-        </tgroup>
-      </table>
-    </para>
     </section>
 
     <section id="s46-options">
diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h
index a6fa4dceda..1f4a350e31 100644
--- a/src/lib/dhcp/dhcp6.h
+++ b/src/lib/dhcp/dhcp6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2006-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -154,16 +154,7 @@ enum DHCPv6OptionType {
 // D6O_F_STATE_EXPIRATION_TIME            = 134, /* RFC8156 */
    D6O_RELAY_SOURCE_PORT                  = 135, /* RFC8357 */
    // 136-142 unassigned
-   D6O_IPV6_ADDRESS_ANDSF                 = 143, /* RFC6153 */
-
-// The following are EXPERIMENTAL and may change when IANA assigns official
-// values.
-/* secure DHCPv6 (draft-ietf-dhc-sedhcpv6-08) */
-/* temporary values for hackathon 93 */
-   D6O_PUBLIC_KEY                         = 701,
-   D6O_CERTIFICATE                        = 702,
-   D6O_SIGNATURE                          = 703,
-   D6O_TIMESTAMP                          = 704
+   D6O_IPV6_ADDRESS_ANDSF                 = 143 /* RFC6153 */
 };
 
 /*
diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index 25d9ae3795..b1f1042446 100644
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -451,14 +451,6 @@ const OptionDefParams STANDARD_V6_OPTION_DEFINITIONS[] = {
     { "relay-source-port", D6O_RELAY_SOURCE_PORT, OPT_UINT16_TYPE, false, NO_RECORD_DEF, "" },
     { "ipv6-address-andsf", D6O_IPV6_ADDRESS_ANDSF, OPT_IPV6_ADDRESS_TYPE, true,
       NO_RECORD_DEF, "" },
-    { "public-key", D6O_PUBLIC_KEY, OPT_BINARY_TYPE, false,
-      NO_RECORD_DEF, "" },
-    { "certificate", D6O_CERTIFICATE, OPT_BINARY_TYPE, false,
-      NO_RECORD_DEF, "" },
-    { "signature", D6O_SIGNATURE, OPT_RECORD_TYPE, false,
-      RECORD_DEF(SIGNATURE_RECORDS), "" },
-    { "timestamp", D6O_TIMESTAMP, OPT_BINARY_TYPE, false,
-      NO_RECORD_DEF, "" },
     { "s46-cont-mape", D6O_S46_CONT_MAPE, OPT_EMPTY_TYPE, false, NO_RECORD_DEF,
         MAPE_V6_OPTION_SPACE },
     { "s46-cont-mapt", D6O_S46_CONT_MAPT, OPT_EMPTY_TYPE, false, NO_RECORD_DEF,
diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 89d5e65092..4dde17ba5a 100644
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1742,18 +1742,6 @@ TEST_F(LibDhcpTest, stdOptionDefs6) {
     LibDhcpTest::testStdOptionDefs6(D6O_IPV6_ADDRESS_ANDSF, begin, end,
                                     typeid(Option6AddrLst));
 
-    LibDhcpTest::testStdOptionDefs6(D6O_PUBLIC_KEY, begin, end,
-                                    typeid(Option));
-
-    LibDhcpTest::testStdOptionDefs6(D6O_CERTIFICATE, begin, end,
-                                    typeid(Option));
-
-    LibDhcpTest::testStdOptionDefs6(D6O_SIGNATURE, begin, end,
-                                    typeid(OptionCustom));
-
-    LibDhcpTest::testStdOptionDefs6(D6O_TIMESTAMP, begin, begin + 8,
-                                    typeid(Option));
-
     // RFC7598 options
     LibDhcpTest::testOptionDefs6(MAPE_V6_OPTION_SPACE, D6O_S46_RULE, begin, end,
                                  typeid(OptionCustom), "s46-rule-options");
-- 
2.47.2