Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-23 05:52:52 +01:00
Code Releases Activity

eap-tls, ttls, peap: Update for private key API changes

Browse Source
This commit is contained in:
Andrew Zaborowski 2018-11-21 16:14:03 +01:00 committed by Denis Kenzior
parent 007d972046
commit 299af7fc39
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/eap-peap.c
View File

@ -953,12 +953,10 @@ static int eap_peap_check_settings(struct l_settings *settings,
} }
if (path) { if (path) {
struct l_key *priv_key;
bool encrypted; bool encrypted;
uint8_t *priv_key;
size_t size;
priv_key = l_pem_load_private_key(path, passphrase, priv_key = l_pem_load_private_key(path, passphrase, &encrypted);
&encrypted, &size);
if (!priv_key) { if (!priv_key) {
if (!encrypted) { if (!encrypted) {
l_error("Error loading client private key %s", l_error("Error loading client private key %s",
@ -982,8 +980,7 @@ static int eap_peap_check_settings(struct l_settings *settings,
passphrase_entry, NULL, path, passphrase_entry, NULL, path,
EAP_CACHE_TEMPORARY); EAP_CACHE_TEMPORARY);
} else { } else {
memset(priv_key, 0, size); l_key_free(priv_key);
l_free(priv_key);
if (passphrase && !encrypted) { if (passphrase && !encrypted) {
l_error("%s present but client private " l_error("%s present but client private "

9
src/eap-tls.c
View File

@ -459,12 +459,10 @@ static int eap_tls_check_settings(struct l_settings *settings,
} }
if (path) { if (path) {
struct l_key *priv_key;
bool encrypted; bool encrypted;
uint8_t *priv_key;
size_t size;
priv_key = l_pem_load_private_key(path, passphrase, priv_key = l_pem_load_private_key(path, passphrase, &encrypted);
&encrypted, &size);
if (!priv_key) { if (!priv_key) {
if (!encrypted) { if (!encrypted) {
l_error("Error loading client private key %s", l_error("Error loading client private key %s",
@ -488,8 +486,7 @@ static int eap_tls_check_settings(struct l_settings *settings,
passphrase_setting, NULL, path, passphrase_setting, NULL, path,
EAP_CACHE_TEMPORARY); EAP_CACHE_TEMPORARY);
} else { } else {
memset(priv_key, 0, size); l_key_free(priv_key);
l_free(priv_key);
if (passphrase && !encrypted) { if (passphrase && !encrypted) {
l_error("%s present but client private " l_error("%s present but client private "

9
src/eap-ttls.c
View File

@ -1221,12 +1221,10 @@ static int eap_ttls_check_settings(struct l_settings *settings,
} }
if (path) { if (path) {
struct l_key *priv_key;
bool encrypted; bool encrypted;
uint8_t *priv_key;
size_t size;
priv_key = l_pem_load_private_key(path, passphrase, priv_key = l_pem_load_private_key(path, passphrase, &encrypted);
&encrypted, &size);
if (!priv_key) { if (!priv_key) {
if (!encrypted) { if (!encrypted) {
l_error("Error loading client private key %s", l_error("Error loading client private key %s",
@ -1250,8 +1248,7 @@ static int eap_ttls_check_settings(struct l_settings *settings,
passphrase_setting, NULL, path, passphrase_setting, NULL, path,
EAP_CACHE_TEMPORARY); EAP_CACHE_TEMPORARY);
} else { } else {
memset(priv_key, 0, size); l_key_free(priv_key);
l_free(priv_key);
if (passphrase && !encrypted) { if (passphrase && !encrypted) {
l_error("%s present but client private " l_error("%s present but client private "