mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-09 08:18:03 +02:00
2005-12-29 Dan Williams <dcbw@redhat.com>
* libnm-util/cipher-wpa-psk-passphrase.c - (cipher_wpa_psk_passphrase_hash_func): return key as hex string like other ciphers git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1236 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
9c898727d8
commit
4dd1456235
2 changed files with 10 additions and 1 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2005-12-29 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* libnm-util/cipher-wpa-psk-passphrase.c
|
||||
- (cipher_wpa_psk_passphrase_hash_func): return key as hex string
|
||||
like other ciphers
|
||||
|
||||
2005-12-23 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* gnome/applet/applet-dbus-info.c
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ static char * cipher_wpa_psk_passphrase_hash_func (IEEE_802_11_Cipher *cipher, c
|
|||
{
|
||||
int ssid_len;
|
||||
char *buf = NULL;
|
||||
char *output = NULL;
|
||||
|
||||
g_return_val_if_fail (cipher != NULL, NULL);
|
||||
g_return_val_if_fail (input != NULL, NULL);
|
||||
|
|
@ -60,6 +61,8 @@ static char * cipher_wpa_psk_passphrase_hash_func (IEEE_802_11_Cipher *cipher, c
|
|||
|
||||
buf = g_malloc0 (WPA_PMK_LEN * 2);
|
||||
pbkdf2_sha1 (input, (char *) ssid, ssid_len, 4096, (unsigned char *) buf, WPA_PMK_LEN);
|
||||
output = cipher_bin2hexstr (buf, WPA_PMK_LEN, WPA_PMK_LEN * 2);
|
||||
g_free (buf);
|
||||
|
||||
return buf;
|
||||
return output;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue