Enable F-Ticks support in distcheck.

[radsecproxy.git] / fticks.c

diff --git a/fticks.c b/fticks.c
index 89081ff..c4acac2 100644 (file)
--- a/fticks.c
+++ b/fticks.c
@@ -4,13 +4,14 @@
 
 #include <stdio.h>             /* For sprintf().  */
 #include <string.h>
+#include <ctype.h>
+#include <errno.h>
 #include <nettle/sha.h>
 #include <nettle/hmac.h>
 
 #include <regex.h>
 #include <pthread.h>
 #include <sys/time.h>
-#include "list.h"
 #include "radsecproxy.h"
 #include "debug.h"
 
@@ -63,7 +64,6 @@ fticks_configure(struct options *options,
 
     if (reporting == NULL)
        goto out;
-
     if (strcasecmp(reporting, "None") == 0)
        options->fticks_reporting = RSP_FTICKS_REPORTING_NONE;
     else if (strcasecmp(reporting, "Basic") == 0)
@@ -77,6 +77,8 @@ fticks_configure(struct options *options,
        goto out;
     }
 
+    if (mac == NULL)
+       goto out;
     if (strcasecmp(mac, "Static") == 0)
        options->fticks_mac = RSP_FTICKS_MAC_STATIC;
     else if (strcasecmp(mac, "Original") == 0)
@@ -130,18 +132,41 @@ out:
     by lowercasing it, removing all but [0-9a-f] and truncating it at
     the first ';' found.  The truncation is done because RADIUS
     supposedly has a praxis of tacking on SSID to the MAC address in
-    Calling-Station-Id.  */
-void
+    Calling-Station-Id.
+
+    \return 0 on success, -ENOMEM on out of memory.
+*/
+int
 fticks_hashmac(const uint8_t *in,
               const uint8_t *key,
               size_t out_len,
               uint8_t *out)
 {
-    /* TODO: lowercase */
-    /* TODO: s/[!0-9a-f]//1 */
-    /* TODO: truncate after first ';', if any */
+    uint8_t *in_copy = NULL;
+    uint8_t *p = NULL;
+    int i;
+
+    in_copy = calloc(1, strlen((const char *) in) + 1);
+    if (in_copy == NULL)
+       return -ENOMEM;
+
+    /* Sanitise and lowercase 'in' into 'in_copy'.  */
+    for (i = 0, p = in_copy; in[i] != '\0'; i++) {
+       if (in[i] == ';') {
+           *p++ = '\0';
+           break;
+       }
+       if (in[i] >= '0' && in[i] <= '9') {
+           *p++ = in[i];
+       }
+       else if (tolower(in[i]) >= 'a' && tolower(in[i]) <= 'f') {
+           *p++ = tolower(in[i]);
+       }
+    }
 
-    _hash(in, key, out_len, out);
+    _hash(in_copy, key, out_len, out);
+    free(in_copy);
+    return 0;
 }
 
 void