Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed"
This reverts commit 1a1e642fd6c1200e7e1979ea70103c484062f3a9.
Reason for revert: Droidcop: Potential culprit for Bug 154881734 - verifying through Forrest before revert submission
Change-Id: I85f75adeb43554b0ebbf295fea51e1b68b169ed2
diff --git a/src/common/dpp.c b/src/common/dpp.c
index b33ab15..d8690ad 100644
--- a/src/common/dpp.c
+++ b/src/common/dpp.c
@@ -74,14 +74,12 @@
}
-#ifdef CONFIG_DPP2
static EC_KEY * EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_EC)
return NULL;
return pkey->pkey.ec;
}
-#endif /* CONFIG_DPP2 */
#endif
@@ -3954,14 +3952,6 @@
dpp_auth_fail(auth,
"Missing Initiator Bootstrapping Key Hash attribute");
return NULL;
- } else if (auth->own_bi &&
- auth->own_bi->type == DPP_BOOTSTRAP_NFC_URI &&
- auth->own_bi->nfc_negotiated) {
- /* NFC negotiated connection handover bootstrapping mandates
- * use of mutual authentication */
- dpp_auth_fail(auth,
- "Missing Initiator Bootstrapping Key Hash attribute");
- return NULL;
}
auth->peer_version = 1; /* default to the first version */
@@ -6740,7 +6730,7 @@
conf->connector = os_strdup(signed_connector);
dpp_copy_csign(conf, csign_pub);
- if (dpp_akm_dpp(conf->akm) || auth->peer_version >= 2)
+ if (dpp_akm_dpp(conf->akm))
dpp_copy_netaccesskey(auth, conf);
ret = 0;