[PATCH-v2 2/4] hs20-client: use configured ca-fname instead of cwd.
greearb at candelatech.com
greearb
Tue Mar 31 17:14:18 PDT 2015
From: Ben Greear <greearb at candelatech.com>
This gives more flexibility to the hs20 client user.
Signed-off-by: Ben Greear <greearb at candelatech.com>
---
hs20/client/osu_client.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/hs20/client/osu_client.c b/hs20/client/osu_client.c
index 649a884..c3d00c0 100644
--- a/hs20/client/osu_client.c
+++ b/hs20/client/osu_client.c
@@ -2036,11 +2036,19 @@ static int osu_connect(struct hs20_osu_client *ctx, const char *bssid,
if (set_network_quoted(ifname, id, "ssid", ssid) < 0)
return -1;
if (osu_nai && os_strlen(osu_nai) > 0) {
- char dir[255], fname[300];
- if (getcwd(dir, sizeof(dir)) == NULL)
- return -1;
- os_snprintf(fname, sizeof(fname), "%s/osu-ca.pem", dir);
+ char fname[300];
+ if (ctx->ca_fname) {
+ strncpy(fname, ctx->ca_fname, sizeof(fname));
+ }
+ else {
+ char dir[255];
+ if (getcwd(dir, sizeof(dir)) == NULL)
+ return -1;
+ os_snprintf(fname, sizeof(fname), "%s/osu-ca.pem", dir);
+ ctx->ca_fname = strdup(fname); /* so lib curl can use it. */
+ }
+ fname[sizeof(fname) - 1] = 0; /* ensure null termination */
if (set_network(ifname, id, "proto", "OSEN") < 0 ||
set_network(ifname, id, "key_mgmt", "OSEN") < 0 ||
set_network(ifname, id, "pairwise", "CCMP") < 0 ||
--
1.9.3
More information about the Hostap
mailing list