Update wps_registrar.c

the world is not yet ready for RNonce
t6x · Apr 27, 2015 · 34583f6 · 34583f6
1 parent 3ec4bd5
commit 34583f6
Showing 1 changed file with 4 additions and 36 deletions.
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
@@ -1738,43 +1738,11 @@ static int wps_process_registrar_nonce(struct wps_data *wps, const u8 *r_nonce)
         wpa_printf(MSG_DEBUG, "WPS: No Registrar Nonce received");
         return -1;
     }
-
-    os_memcpy(wps->nonce_r, r_nonce, WPS_NONCE_LEN);
-    wpa_hexdump(MSG_DEBUG, "WPS: Registrar Nonce",
-            wps->nonce_r, WPS_NONCE_LEN);
-
-    /****** ADD THIS PART ******/
-    memset(cmd_pixie,0,sizeof(cmd_pixie));
-    memset(cmd_pixie_aux,0,sizeof(cmd_pixie_aux));
-    strcat(cmd_pixie,"pixiewps ");
-
-    if(globule->op_pixie==1 || globule->op_pixie==2 || globule->op_pixie==3)
-    {
-      strcat(cmd_pixie," -m "); 
-    }
-    printf("[P] R-Nonce: ");
-    int pixiecnt = 0;
-    for (; pixiecnt < WPS_NONCE_LEN; pixiecnt++) 
-    {
-        printf("%02x", wps->nonce_r[pixiecnt]);
-        if(globule->op_pixie==1 || globule->op_pixie==2 || globule->op_pixie==3)
-        {
-            sprintf(cmd_pixie_aux, "%02x",  wps->nonce_r[pixiecnt]);
-            strcat(cmd_pixie,cmd_pixie_aux);
-        }
-        if (pixiecnt != WPS_NONCE_LEN - 1) {
-            printf(":");
-            if(globule->op_pixie==1 || globule->op_pixie==2 || globule->op_pixie==3)
-            {
-                strcat(cmd_pixie,":");
-            }
-        }
+    if (os_memcmp(wps->nonce_r, r_nonce, WPS_NONCE_LEN) != 0) {
+        wpa_printf(MSG_DEBUG, "WPS: Invalid Registrar Nonce received");
+        return -1;
     }
-    printf("\n");
-    /******/
-
-
-    return 0;
+        return 0;
 }