From 6b2a649dff55da23e9dfd99b30179e4d1e1476ab Mon Sep 17 00:00:00 2001
From: Brian Moore <brian@briansblog.net>
Date: Sat, 30 May 2015 15:31:09 -0700
Subject: [PATCH] Pixewps 1.1 enforces mutual exclusivity with -r and -S
 options.

---
 src/wps/wps_registrar.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 743d061..0dc6208 100644
--- 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 ");