diff options
author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-12-04 18:26:06 +0200 |
---|---|---|
committer | Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> | 2016-01-11 08:09:14 +0530 |
commit | 739b58022c8a0ce4c0013acc4c0b5ca5a49de33c (patch) | |
tree | 14eeabbd3a4a67752a38856c3aadcf8717d4019e /hs20 | |
parent | 5743cf04ad3c3b52e7fa2fd1191327322fe7390f (diff) | |
download | android_external_wpa_supplicant_8-739b58022c8a0ce4c0013acc4c0b5ca5a49de33c.tar.gz android_external_wpa_supplicant_8-739b58022c8a0ce4c0013acc4c0b5ca5a49de33c.tar.bz2 android_external_wpa_supplicant_8-739b58022c8a0ce4c0013acc4c0b5ca5a49de33c.zip |
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>
Git-commit: e007d538cd45eb29bd31c45fd63451b138508389
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: I4bad58cabb39936c64c07491383b65f3c8de4df5
CRs-fixed: 960177
Diffstat (limited to 'hs20')
-rw-r--r-- | hs20/client/est.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hs20/client/est.c b/hs20/client/est.c index 90a51d5a..9f1519bf 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; |