← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wpasupplicant/vivid

« back to all changes in this revision

Viewing changes to wpa_passphrase.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2008-03-12 20:03:04 UTC
  • mfrom: (1.1.10 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20080312200304-4331y9wj46pdd34z
Tags: 0.6.3-1
http://bugs.debian.org/466910
* New upstream release.
* Drop patches applied upstream:
  - debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
  - debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
  - debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
  - debian/patches/40_dbus_ssid_data.patch
* Tidy up the clean target of debian/rules. Now that the madwifi headers are
  handled differently we no longer need to do any cleanup.
* Fix formatting error in debian/ifupdown/wpa_action.8 to make lintian
  quieter.
* Add patch to fix formatting errors in manpages build from sgml source. Use
  <emphasis> tags to hightlight keywords instead of surrounding them in
  strong quotes.
  - debian/patches/41_manpage_format_fixes.patch
* wpasupplicant binary package no longer suggests pcscd, guessnet, iproute
  or wireless-tools, nor does it recommend dhcp3-client. These are not
  needed.
* Add debian/patches/10_silence_siocsiwauth_icotl_failure.patch to disable
  ioctl failure messages that occur under normal conditions.
* Cherry pick two upstream git commits concerning the dbus interface:
  - debian/patches/11_avoid_dbus_version_namespace.patch
  - debian/patches/12_fix_potential_use_after_free.patch
* Add debian/patches/42_manpage_explain_available_drivers.patch to explain
  that not all of the driver backends are available in the provided
  wpa_supplicant binary, and that the canonical list of supported driver
  backends can be retrieved from the wpa_supplicant -h (help) output.
  (Closes: #466910)
* Add debian/patches/20_wpa_gui_qt4_disable_link_prl.patch to remove
  link_prl CONFIG compile flag added by qmake-qt4 >= 4.3.4-2 to avoid excess
  linking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wpa_passphrase.c
1
 
/*
2
 
 * WPA Supplicant - ASCII passphrase to WPA PSK tool
3
 
 * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
4
 
 *
5
 
 * This program is free software; you can redistribute it and/or modify
6
 
 * it under the terms of the GNU General Public License version 2 as
7
 
 * published by the Free Software Foundation.
8
 
 *
9
 
 * Alternatively, this software may be distributed under the terms of BSD
10
 
 * license.
11
 
 *
12
 
 * See README and COPYING for more details.
13
 
 */
14
 
 
15
 
#include "includes.h"
16
 
 
17
 
#include "common.h"
18
 
#include "sha1.h"
19
 
 
20
 
 
21
 
int main(int argc, char *argv[])
22
 
{
23
 
        unsigned char psk[32];
24
 
        int i;
25
 
        char *ssid, *passphrase, buf[64], *pos;
26
 
 
27
 
        if (argc < 2) {
28
 
                printf("usage: wpa_passphrase <ssid> [passphrase]\n"
29
 
                        "\nIf passphrase is left out, it will be read from "
30
 
                        "stdin\n");
31
 
                return 1;
32
 
        }
33
 
 
34
 
        ssid = argv[1];
35
 
 
36
 
        if (argc > 2) {
37
 
                passphrase = argv[2];
38
 
        } else {
39
 
                printf("# reading passphrase from stdin\n");
40
 
                if (fgets(buf, sizeof(buf), stdin) == NULL) {
41
 
                        printf("Failed to read passphrase\n");
42
 
                        return 1;
43
 
                }
44
 
                buf[sizeof(buf) - 1] = '\0';
45
 
                pos = buf;
46
 
                while (*pos != '\0') {
47
 
                        if (*pos == '\r' || *pos == '\n') {
48
 
                                *pos = '\0';
49
 
                                break;
50
 
                        }
51
 
                        pos++;
52
 
                }
53
 
                passphrase = buf;
54
 
        }
55
 
 
56
 
        if (os_strlen(passphrase) < 8 || os_strlen(passphrase) > 63) {
57
 
                printf("Passphrase must be 8..63 characters\n");
58
 
                return 1;
59
 
        }
60
 
 
61
 
        pbkdf2_sha1(passphrase, ssid, os_strlen(ssid), 4096, psk, 32);
62
 
 
63
 
        printf("network={\n");
64
 
        printf("\tssid=\"%s\"\n", ssid);
65
 
        printf("\t#psk=\"%s\"\n", passphrase);
66
 
        printf("\tpsk=");
67
 
        for (i = 0; i < 32; i++)
68
 
                printf("%02x", psk[i]);
69
 
        printf("\n");
70
 
        printf("}\n");
71
 
 
72
 
        return 0;
73
 
}