Fix compiler warning

diff --git a/ipv6.c b/ipv6.c
index 191e263bf8831e60e837ec3084da87d064a1f9bb..e7ff9344bb72d821240d25b93dc99ee09e5e13e7 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -379,6 +379,56 @@ ipv6_userprefix(
        return 0;
 }
 
+int
+ipv6_makestableprivate(struct in6_addr *addr,
+    const struct in6_addr *prefix, int prefix_len,
+    const unsigned char *netiface, size_t netiface_len,
+    const unsigned char *netid, size_t netid_len,
+    uint32_t dad_counter,
+    const char *secret, size_t secret_len)
+{
+       unsigned char buf[2048], digest[SHA256_DIGEST_STRING_LENGTH];
+       size_t len, l;
+       SHA256_CTX ctx;
+
+       if (prefix_len < 0 || prefix_len > 120) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       l = ROUNDUP8(prefix_len);
+       len = l + netiface_len + netid_len + sizeof(dad_counter) + secret_len;
+       if (len > sizeof(buf)) {
+               errno = ENOBUF;
+               return -1;
+       }
+
+       /* Combine all parameters into one buffer */
+       p = buf;
+       memcpy(p, prefix, l);
+       p += l;
+       memcpy(p, netiface, netiface_len);
+       p += netiface_len;
+       memcpy(p, netid, netid_len);
+       p += netid_len;
+       memcpy(p, dad_counter, sizeof(dad_counter));
+       p += sizeof(dad_counter);
+       memcpy(p, secret, secret_len);
+
+       /* Make an address using the prefix and the digest of the above.
+        * RFC7212 Section 5.1 states that we shouldn't use MD5.
+        * Pity as we use that for HMAC-MD5 which is still deemed OK.
+        * SHA-256 is recommended */
+       SHA256_Init(&ctx);
+       SHA256_Update(&ctx, buf, len);
+       SHA256_Final(digest, &ctx);
+
+       memcpy(addr->s6_addr, prefix, l);
+       l = 128 - l;
+       memcpy(addr->s6_addr + l, hash, 128 - l);
+       return 0;
+}
+
 #ifdef IPV6_POLLADDRFLAG
 void
 ipv6_checkaddrflags(void *arg)

diff --git a/test/test_hmac_md5.c b/test/test_hmac_md5.c
index 1da71a251b9257823614369568c39896bd32c06f..13099d005da2af7c0475486fb951ad2f4fd8321d 100644 (file)
--- a/test/test_hmac_md5.c
+++ b/test/test_hmac_md5.c
@@ -97,7 +97,7 @@ hmac_md5_test4(void)
        uint8_t hmac[16];
        uint8_t text[50];
        uint8_t key[25];
-       int i;
+       uint8_t i;
 
        printf ("HMAC MD5 Test 4:\t\t");
        for (i = 0; i < 50; i++)