Add valid UUID processing.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/crda.c b/crda.c
index 453f134..f36e98e 100644 (file)
--- a/crda.c
+++ b/crda.c
@@ -112,13 +112,106 @@ static int is_alpha2(char *alpha2)
        return 0;
 }
 
-static int uuid_ok(char *uuid)
+static int is_world_regdom(char *alpha2)
+{
+       /* ASCII 0 */
+       if (alpha2[0] == 48 && alpha2[1] == 48)
+               return 1;
+       return 0;
+}
+
+static int is_hex_alpha_upper(char hex)
+{
+       if (hex >= 65 && hex <= 90)
+               return 1;
+       return 0;
+}
+
+static int is_hex_alpha_lower(char hex)
+{
+       if (hex >= 97 && hex <= 122)
+               return 1;
+       return 0;
+}
+
+static int is_hex_alpha(char hex)
+{
+       if (is_hex_alpha_upper(hex) || is_hex_alpha_lower(hex))
+               return 1;
+       return 0;
+}
+
+static int is_hex_digit(char hex)
+{
+       if (hex >= 48 && hex <= 57)
+               return 1;
+       return 0;
+}
+
+static int is_hex(char hex)
+{
+       if (is_hex_alpha(hex) || is_hex_digit(hex))
+               return 1;
+       return 0;
+}
+
+static unsigned char hex2char(char hex0)
+{
+       if (is_hex_alpha(hex0)) {
+               if (is_hex_alpha_upper(hex0))
+                       return (hex0 - 65 + 10); /* A-F */
+               return (hex0 - 97 + 10); /* a-f */
+       }
+       return (hex0 - 48); /* 0-9 */
+}
+
+static unsigned char hexstring2char(char hex0, char hex1)
+{
+       return (hex2char(hex0) + (hex2char(hex1) * 16));
+}
+
+int parse_uuid(char *hexstring, unsigned char *uuid)
 {
        int i;
-       if (strlen(uuid) != 16)
+       char check_uuid[32];
+       if (strlen(hexstring) != 32)
+               return 1;
+       for (i=0; i<16; i++) {
+               uuid[i] = hexstring2char(hexstring[(i*2)+1], hexstring[i*2]);
+#ifdef DEBUG
+               printf("0x%c%c = 0x%02x\n",
+                       hexstring[i*2],
+                       hexstring[(i*2)+1],
+                       hexstring2char(hexstring[(i*2)+1], hexstring[i*2]));
+#endif
+       }
+       sprintf(check_uuid,
+               "%02x%02x%02x%02x"
+               "%02x%02x%02x%02x"
+               "%02x%02x%02x%02x"
+               "%02x%02x%02x%02x",
+               uuid[0], uuid[1], uuid[2], uuid[3],
+               uuid[4], uuid[5], uuid[6], uuid[7],
+               uuid[8], uuid[9], uuid[10], uuid[11],
+               uuid[12], uuid[13], uuid[14], uuid[15]);
+#ifdef DEBUG
+       printf("UUID check: %s\n", check_uuid);
+#endif
+       /* For now we use support the kernel asking us in lower case only */
+       if (memcmp(check_uuid, hexstring, 32) != 0) {
+               fprintf(stderr, "Could not covert UUID string correctly\n");
+               return 1;
+       }
+       return 0;
+}
+
+static int uuid_ok(char *uuid_string)
+{
+       int i;
+       if (strlen(uuid_string) != 32)
                return 0;
-       for (i=0; i<16; i++)
-               if(!isalnum(uuid[i]))
+       for (i=0; i<32; i++)
+               if(!is_hex(uuid_string[i]))
                        return 0;
        return 1;
 }
@@ -189,7 +282,7 @@ int main(int argc, char **argv)
                return -EINVAL;
        }
        
-       if (!is_alpha2(argv[1])) {
+       if (!is_alpha2(argv[1]) && !is_world_regdom(argv[1])) {
                fprintf(stderr, "Invalid alpha2\n");
                return -EINVAL;
        }
@@ -201,7 +294,12 @@ int main(int argc, char **argv)
                return -EINVAL;
        }
 
-       memcpy(uuid, argv[2], 16);
+       r = parse_uuid(argv[2], uuid);
+       if (r) {
+               fprintf(stderr, "Length of UUID hex string must be 32 characters\n");
+               fprintf(stderr, "Usage: %s <ISO-3166 alpha2 country code> <UUID>\n", argv[0]);
+               return r;
+       }
 
        r = nl80211_init(&nlstate);
        if (r)