From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri, 4 Dec 2015 16:26:06 +0000 (+0200)
Subject: EST: Comment out X509_REQ_print calls on Android with BoringSSL
X-Git-Tag: hostap_2_6~1239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e007d538cd45eb29bd31c45fd63451b138508389;p=thirdparty%2Fhostap.git

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>
---

diff --git a/hs20/client/est.c b/hs20/client/est.c
index 90a51d5ad..9f1519bf4 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;