struct wps_uuid_pin {
struct wps_uuid_pin *next;
u8 uuid[WPS_UUID_LEN];
+ int wildcard_uuid;
u8 *pin;
size_t pin_len;
int locked;
p = os_zalloc(sizeof(*p));
if (p == NULL)
return -1;
- os_memcpy(p->uuid, uuid, WPS_UUID_LEN);
+ if (uuid == NULL)
+ p->wildcard_uuid = 1;
+ else
+ os_memcpy(p->uuid, uuid, WPS_UUID_LEN);
p->pin = os_malloc(pin_len);
if (p->pin == NULL) {
os_free(p);
pin = reg->pins;
while (pin) {
- if (os_memcmp(pin->uuid, uuid, WPS_UUID_LEN) == 0) {
- /*
- * Lock the PIN to avoid attacks based on concurrent
- * re-use of the PIN that could otherwise avoid PIN
- * invalidations.
- */
- if (pin->locked) {
- wpa_printf(MSG_DEBUG, "WPS: Selected PIN "
- "locked - do not allow concurrent "
- "re-use");
- return NULL;
+ if (!pin->wildcard_uuid &&
+ os_memcmp(pin->uuid, uuid, WPS_UUID_LEN) == 0)
+ break;
+ pin = pin->next;
+ }
+
+ if (!pin) {
+ /* Check for wildcard UUIDs since none of the UUID-specific
+ * PINs matched */
+ pin = reg->pins;
+ while (pin) {
+ if (pin->wildcard_uuid == 1) {
+ wpa_printf(MSG_DEBUG, "WPS: Found a wildcard "
+ "PIN. Assigned it for this UUID-E");
+ pin->wildcard_uuid = 2;
+ os_memcpy(pin->uuid, uuid, WPS_UUID_LEN);
+ break;
}
- *pin_len = pin->pin_len;
- pin->locked = 1;
- return pin->pin;
+ pin = pin->next;
}
- pin = pin->next;
}
- return NULL;
+ if (!pin)
+ return NULL;
+
+ /*
+ * Lock the PIN to avoid attacks based on concurrent re-use of the PIN
+ * that could otherwise avoid PIN invalidations.
+ */
+ if (pin->locked) {
+ wpa_printf(MSG_DEBUG, "WPS: Selected PIN locked - do not "
+ "allow concurrent re-use");
+ return NULL;
+ }
+ *pin_len = pin->pin_len;
+ pin->locked = 1;
+ return pin->pin;
}
pin = reg->pins;
while (pin) {
if (os_memcmp(pin->uuid, uuid, WPS_UUID_LEN) == 0) {
+ if (pin->wildcard_uuid == 2) {
+ wpa_printf(MSG_DEBUG, "WPS: Invalidating used "
+ "wildcard PIN");
+ return wps_registrar_invalidate_pin(reg, uuid);
+ }
pin->locked = 0;
return 0;
}