Merge tag 'upstream/0.9.2' into debian

[mech_eap.git] / libeap / wpa_supplicant / wpa_passphrase.c

diff --git a/libeap/wpa_supplicant/wpa_passphrase.c b/libeap/wpa_supplicant/wpa_passphrase.c
deleted file mode 100644 (file)
index 67465aa..0000000
--- a/libeap/wpa_supplicant/wpa_passphrase.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * WPA Supplicant - ASCII passphrase to WPA PSK tool
- * Copyright (c) 2003-2005, Jouni Malinen <j@w1.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
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "crypto/sha1.h"
-
-
-int main(int argc, char *argv[])
-{
-       unsigned char psk[32];
-       int i;
-       char *ssid, *passphrase, buf[64], *pos;
-
-       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];
-
-       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 (os_strlen(passphrase) < 8 || os_strlen(passphrase) > 63) {
-               printf("Passphrase must be 8..63 characters\n");
-               return 1;
-       }
-
-       pbkdf2_sha1(passphrase, ssid, os_strlen(ssid), 4096, psk, 32);
-
-       printf("network={\n");
-       printf("\tssid=\"%s\"\n", ssid);
-       printf("\t#psk=\"%s\"\n", passphrase);
-       printf("\tpsk=");
-       for (i = 0; i < 32; i++)
-               printf("%02x", psk[i]);
-       printf("\n");
-       printf("}\n");
-
-       return 0;
-}