aboutsummaryrefslogtreecommitdiffstats
path: root/hs20
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-12-04 16:26:06 (GMT)
committerJouni Malinen <j@w1.fi>2015-12-04 18:08:31 (GMT)
commite007d538cd45eb29bd31c45fd63451b138508389 (patch)
tree3161b07937f10b6547c61d2fb20a5f8099bc4636 /hs20
parente6f4832737cd2b83b010e13582f59f2b4a965ce6 (diff)
downloadhostap-e007d538cd45eb29bd31c45fd63451b138508389.zip
hostap-e007d538cd45eb29bd31c45fd63451b138508389.tar.gz
hostap-e007d538cd45eb29bd31c45fd63451b138508389.tar.bz2
EST: Comment out X509_REQ_print calls on Android with BoringSSL
These were restored into BoringSSL in June 2015, but not all Android branches include those changes. To fix the build, comment these call out on Android for now if hs20-osu-client is built against BoringSSL. These are used only for debugging purposes, so this is fine for Hotspot 2.0 functionality. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'hs20')
-rw-r--r--hs20/client/est.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hs20/client/est.c b/hs20/client/est.c
index 90a51d5..9f1519b 100644
--- a/hs20/client/est.c
+++ b/hs20/client/est.c
@@ -498,7 +498,9 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
char *txt;
size_t rlen;
+#if !defined(ANDROID) || !defined(OPENSSL_IS_BORINGSSL)
X509_REQ_print(out, req);
+#endif
rlen = BIO_ctrl_pending(out);
txt = os_malloc(rlen + 1);
if (txt) {
@@ -517,7 +519,9 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
FILE *f = fopen(csr_pem, "w");
if (f == NULL)
goto fail;
+#if !defined(ANDROID) || !defined(OPENSSL_IS_BORINGSSL)
X509_REQ_print_fp(f, req);
+#endif
if (!PEM_write_X509_REQ(f, req)) {
fclose(f);
goto fail;