Import of WPA supplicant 0.4.8

1 files changed, 26 insertions, 5 deletions

diff --git a/contrib/wpa_supplicant/wpa_passphrase.c b/contrib/wpa_supplicant/wpa_passphrase.c
index 5a8203b..2a68cb5 100644
--- a/contrib/wpa_supplicant/wpa_passphrase.c
+++ b/contrib/wpa_supplicant/wpa_passphrase.c
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant - ASCII passphrase to WPA PSK tool
- * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -23,15 +23,36 @@ int main(int argc, char *argv[])
 {
 	unsigned char psk[32];
 	int i;
-	char *ssid, *passphrase;
+	char *ssid, *passphrase, buf[64], *pos;
 
-	if (argc != 3) {
-		printf("usage: wpa_passphrase <ssid> <passphrase>\n");
+	if (argc < 2) {
+		printf("usage: wpa_passphrase <ssid> [passphrase]\n"
+			"\nIf passphrase is left out, it will be read from "
+			"stdin\n");
 		return 1;
 	}
 
 	ssid = argv[1];
-	passphrase = argv[2];
+
+	if (argc > 2) {
+		passphrase = argv[2];
+	} else {
+		printf("# reading passphrase from stdin\n");
+		if (fgets(buf, sizeof(buf), stdin) == NULL) {
+			printf("Failed to read passphrase\n");
+			return 1;
+		}
+		buf[sizeof(buf) - 1] = '\0';
+		pos = buf;
+		while (*pos != '\0') {
+			if (*pos == '\r' || *pos == '\n') {
+				*pos = '\0';
+				break;
+			}
+			pos++;
+		}
+		passphrase = buf;
+	}
 
 	if (strlen(passphrase) < 8 || strlen(passphrase) > 63) {
 		printf("Passphrase must be 8..63 characters\n");