jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

EST: Comment out X509_REQ_print calls on Android with BoringSSL

Browse source 
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>
This commit is contained in:
Jouni Malinen 2015-12-04 18:26:06 +02:00 committed by Jouni Malinen
parent e6f4832737
commit e007d538cd
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hs20/client/est.c
View file

@ -498,7 +498,9 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
char *txt; char *txt;
size_t rlen; size_t rlen;
#if !defined(ANDROID) || !defined(OPENSSL_IS_BORINGSSL)
X509_REQ_print(out, req); X509_REQ_print(out, req);
#endif
rlen = BIO_ctrl_pending(out); rlen = BIO_ctrl_pending(out);
txt = os_malloc(rlen + 1); txt = os_malloc(rlen + 1);
if (txt) { if (txt) {
@ -517,7 +519,9 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
FILE *f = fopen(csr_pem, "w"); FILE *f = fopen(csr_pem, "w");
if (f == NULL) if (f == NULL)
goto fail; goto fail;
#if !defined(ANDROID) || !defined(OPENSSL_IS_BORINGSSL)
X509_REQ_print_fp(f, req); X509_REQ_print_fp(f, req);
#endif
if (!PEM_write_X509_REQ(f, req)) { if (!PEM_write_X509_REQ(f, req)) {
fclose(f); fclose(f);
goto fail; goto fail;