Implement Force Renew Nonce Capability option, RFC6704

diff --git a/dhcp.c b/dhcp.c
index 4abd4d4d4392ec55b13d05450f33cc90bc759427..59f475e720797fd3d0b4e1fae444fe03a9a4f3eb 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -866,6 +866,11 @@ make_message(struct dhcp_message **message,
                        p += ifo->vendor[0] + 1;
                }
 
+               /* We support HMAC-MD5 */
+               *p++ = DHO_FORCERENEW_NONCE;
+               *p++ = 1;
+               *p++ = AUTH_ALG_HMAC_MD5;
+
                if (ifo->vivco_len) {
                        *p++ = DHO_VIVCO;
                        lp = p++;

diff --git a/dhcp.h b/dhcp.h
index 92e8bd2cc52a2637a04228635b820cac4608fe2f..2b83714405c659890471a5f458756443128e9eca 100644 (file)
--- a/dhcp.h
+++ b/dhcp.h
@@ -108,10 +108,11 @@ enum DHO {
        DHO_RAPIDCOMMIT            = 80,  /* RFC 4039 */
        DHO_FQDN                   = 81,
        DHO_AUTHENTICATION         = 90,  /* RFC 3118 */
-       DHO_VIVCO                  = 124, /* RFC 3925 */
-       DHO_VIVSO                  = 125, /* RFC 3925 */
        DHO_DNSSEARCH              = 119, /* RFC 3397 */
        DHO_CSR                    = 121, /* RFC 3442 */
+       DHO_VIVCO                  = 124, /* RFC 3925 */
+       DHO_VIVSO                  = 125, /* RFC 3925 */
+       DHO_FORCERENEW_NONCE       = 145, /* RFC 6704 */
        DHO_SIXRD                  = 212, /* RFC 5969 */
        DHO_MSCSR                  = 249, /* MS code for RFC 3442 */
        DHO_END                    = 255

diff --git a/dhcpcd-definitions.conf b/dhcpcd-definitions.conf
index 842608610ec989f66745f24679307b66ab365ef9..029bb0146a0f254caad74c96c23c84fcb7a611a3 100644 (file)
--- a/dhcpcd-definitions.conf
+++ b/dhcpcd-definitions.conf
@@ -164,6 +164,9 @@ embed               uint32                  enterprise_number
 # Their code is matched to the enterprise number defined above
 # see the end of this file for an example
 
+# DHCP FORCERENEW Nonce Capability, RFC6704
+define 145     array byte              forcerenew_nonce_capable
+
 # DHCP IPv6 Rapid Deployment on IPv4 Infrastructures, RFC5969
 define 212     rfc5969                 sixrd
 

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 770d23a05442f8136719e0a36c1021ca378a10e1..343781e7e3caa7600f80cd64a37738f37f668cd3 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -656,7 +656,7 @@ RFC\ 951, RFC\ 1534, RFC\ 2104, RFC\ 2131, RFC\ 2132, RFC\ 2855, RFC\ 3004,
 RFC\ 3118, RFC\ 3203, RFC\ 3315, RFC\ 3361, RFC\ 3633, RFC\ 3396, RFC\ 3397,
 RFC\ 3442, RFC\ 3495, RFC\ 3925, RFC\ 3927, RFC\ 4039, RFC\ 4075, RFC\ 4242,
 RFC\ 4361, RFC\ 4390, RFC\ 4702, RFC\ 4074, RFC\ 4861, RFC\ 4833, RFC\ 5227,
-RFC\ 5942, RFC\ 5969, RFC\ 6106.
+RFC\ 5942, RFC\ 5969, RFC\ 6106, RFC\ 6704.
 .Sh AUTHORS
 .An Roy Marples Aq Mt roy@marples.name
 .Sh BUGS