Switch to a leaner MD5 library

[odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9bc03ea55fafb8409434f0ef9c68f9c641fb3bf9..5a6fd8303646a8f1902ba9d8ff42c4e8642cef6b 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
 
 #include <net/if.h>
@@ -102,8 +101,6 @@ static int64_t t1 = 0, t2 = 0, t3 = 0;
 static int request_prefix = -1;
 static enum odhcp6c_ia_mode na_mode = IA_MODE_NONE, pd_mode = IA_MODE_NONE;
 static bool accept_reconfig = false;
-// Server unicast address
-static struct in6_addr server_addr = IN6ADDR_ANY_INIT;
 
 // Reconfigure key
 static uint8_t reconf_key[16];
@@ -166,7 +163,6 @@ int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout)
                        htons(DHCPV6_OPT_SIP_SERVER_A),
                        htons(DHCPV6_OPT_DNS_SERVERS),
                        htons(DHCPV6_OPT_DNS_DOMAIN),
-                       htons(DHCPV6_OPT_UNICAST),
                        htons(DHCPV6_OPT_NTP_SERVER),
                        htons(DHCPV6_OPT_AFTR_NAME),
                        htons(DHCPV6_OPT_PD_EXCLUDE),
@@ -374,29 +370,7 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
                0, ALL_DHCPV6_RELAYS, ifindex};
        struct msghdr msg = {&srv, sizeof(srv), iov, cnt, NULL, 0, 0};
 
-       switch (type) {
-       case DHCPV6_MSG_REQUEST:
-       case DHCPV6_MSG_RENEW:
-       case DHCPV6_MSG_RELEASE:
-       case DHCPV6_MSG_DECLINE:
-               if (!IN6_IS_ADDR_UNSPECIFIED(&server_addr) &&
-                       odhcp6c_addr_in_scope(&server_addr)) {
-                       srv.sin6_addr = server_addr;
-                       if (!IN6_IS_ADDR_LINKLOCAL(&server_addr))
-                               srv.sin6_scope_id = 0;
-               }
-               break;
-       default:
-               break;
-       }
-
-       if (sendmsg(sock, &msg, 0) < 0) {
-               char in6_str[INET6_ADDRSTRLEN];
-
-               syslog(LOG_ERR, "Failed to send DHCPV6 message to %s (%s)",
-                       inet_ntop(AF_INET6, (const void *)&srv.sin6_addr,
-                               in6_str, sizeof(in6_str)), strerror(errno));
-       }
+       sendmsg(sock, &msg, 0);
 }
 
 
@@ -590,7 +564,7 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                        if (r->protocol != 3 || r->algorithm != 1 || r->reconf_type != 2)
                                continue;
 
-                       md5_state_t md5;
+                       md5_ctx_t md5;
                        uint8_t serverhash[16], secretbytes[16], hash[16];
                        memcpy(serverhash, r->key, sizeof(serverhash));
                        memset(r->key, 0, sizeof(r->key));
@@ -599,20 +573,20 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                        for (size_t i = 0; i < sizeof(secretbytes); ++i)
                                secretbytes[i] ^= 0x36;
 
-                       md5_init(&md5);
-                       md5_append(&md5, secretbytes, sizeof(secretbytes));
-                       md5_append(&md5, buf, len);
-                       md5_finish(&md5, hash);
+                       md5_begin(&md5);
+                       md5_hash(secretbytes, sizeof(secretbytes), &md5);
+                       md5_hash(buf, len, &md5);
+                       md5_end(hash, &md5);
 
                        for (size_t i = 0; i < sizeof(secretbytes); ++i) {
                                secretbytes[i] ^= 0x36;
                                secretbytes[i] ^= 0x5c;
                        }
 
-                       md5_init(&md5);
-                       md5_append(&md5, secretbytes, sizeof(secretbytes));
-                       md5_append(&md5, hash, 16);
-                       md5_finish(&md5, hash);
+                       md5_begin(&md5);
+                       md5_hash(secretbytes, sizeof(secretbytes), &md5);
+                       md5_hash(hash, 16, &md5);
+                       md5_end(hash, &md5);
 
                        rcauth_ok = !memcmp(hash, serverhash, sizeof(hash));
                } else if (otype == DHCPV6_OPT_RECONF_MESSAGE && olen == 1) {
@@ -679,7 +653,7 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
        uint16_t olen, otype;
        uint8_t *odata, pref = 0;
        struct dhcpv6_server_cand cand = {false, false, 0, 0, {0},
-                                       IN6ADDR_ANY_INIT, DHCPV6_SOL_MAX_RT, 
+                                       DHCPV6_SOL_MAX_RT,
                                        DHCPV6_INF_MAX_RT, NULL, NULL, 0, 0};
        bool have_na = false;
        int have_pd = 0;
@@ -710,8 +684,6 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
                } else if (otype == DHCPV6_OPT_PREF && olen >= 1 &&
                                cand.preference >= 0) {
                        cand.preference = pref = odata[0];
-               } else if (otype == DHCPV6_OPT_UNICAST && olen == sizeof(cand.server_addr)) {
-                       cand.server_addr = *(struct in6_addr *)odata;
                } else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
                        cand.wants_reconfigure = true;
                } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
@@ -881,8 +853,6 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                                continue;
 
                        dhcpv6_parse_ia(ia_hdr, odata + olen + sizeof(*ia_hdr));
-               } else if (otype == DHCPV6_OPT_UNICAST && olen == sizeof(server_addr)) {
-                       server_addr = *(struct in6_addr *)odata;
                } else if (otype == DHCPV6_OPT_STATUS && olen >= 2) {
                        uint8_t *mdata = (olen > 2) ? &odata[2] : NULL;
                        uint16_t mlen = (olen > 2) ? olen - 2 : 0;
@@ -1146,6 +1116,8 @@ static int dhcpv6_calc_refresh_timers(void)
                t1 = l_t1;
                t2 = l_t2;
                t3 = l_t3;
+       } else {
+               t1 = 600;
        }
 
        return (int)(ia_pd_entries + ia_na_entries);
@@ -1182,18 +1154,7 @@ static void dhcpv6_handle_status_code(const enum dhcpv6_msg orig,
                break;
 
        case DHCPV6_UseMulticast:
-               switch(orig) {
-               case DHCPV6_MSG_REQUEST:
-               case DHCPV6_MSG_RENEW:
-               case DHCPV6_MSG_RELEASE:
-               case DHCPV6_MSG_DECLINE:
-                       // Message needs to be retransmitted according to RFC3315 chapter 18.1.8
-                       server_addr = in6addr_any;
-                       *ret = 0;
-                       break;
-               default:
-                       break;
-               }
+               // TODO handle multicast status code
                break;
 
        case DHCPV6_NoAddrsAvail:
@@ -1294,7 +1255,8 @@ int dhcpv6_promote_server_cand(void)
        size_t cand_len;
        struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
        uint16_t hdr[2];
-       int ret = DHCPV6_STATELESS;
+       int ret = (na_mode == IA_MODE_NONE && pd_mode == IA_MODE_NONE) ?
+                       DHCPV6_STATELESS : DHCPV6_STATEFUL;
 
        // Clear lingering candidate state info
        odhcp6c_clear_state(STATE_SERVER_ID);