Merge pull request #16 from ldm314/pixiewps_1_1

Pixiewps 1.1 enforces mutual exclusivity with -r and -S options.
t6x · May 31, 2015 · a41ae4f · a41ae4f
2 parents 368ccc6 + 6b2a649
commit a41ae4f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
@@ -1838,8 +1838,12 @@ static int wps_process_e_hash2(struct wps_data *wps, const u8 *e_hash2)
 
     strcat(cmd_pixie,"pixiewps -e ");
     strcat(cmd_pixie,pixie_pke);
-    strcat(cmd_pixie," -r ");
-    strcat(cmd_pixie,pixie_pkr);
+
+    if(globule->dh_small != 1){
+        strcat(cmd_pixie," -r ");
+        strcat(cmd_pixie,pixie_pkr);
+    }
+
     strcat(cmd_pixie," -s ");
     strcat(cmd_pixie,pixie_ehash1);
     strcat(cmd_pixie," -z ");