diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-10-10 00:07:32 +0300 |
|---|---|---|
| committer | Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> | 2016-01-11 08:03:20 +0530 |
| commit | e81abeb3ca3e6793bdb623ef8484a23d18d5df9c (patch) | |
| tree | 27710941821c564d15f5326de44cd23ecb51cfef /hs20 | |
| parent | 038eaef6dcd55478b531382e6a394630d9525260 (diff) | |
| download | android_external_wpa_supplicant_8-e81abeb3ca3e6793bdb623ef8484a23d18d5df9c.tar.gz android_external_wpa_supplicant_8-e81abeb3ca3e6793bdb623ef8484a23d18d5df9c.tar.bz2 android_external_wpa_supplicant_8-e81abeb3ca3e6793bdb623ef8484a23d18d5df9c.zip | |
hs20-osu-client: Disable EST with BoringSSL to fix build
BoringSSL has dropped OpenSSL functionality that was used in the EST
implementation. For now, disable EST with BoringSSL to allow
hs20-osu-client to be built.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 63d9bf81aba9613937652a12f5d6c7b394de8003
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: I38ab297211842f44cc6a0ce55ba897cb06db88bb
CRs-fixed: 960177
Diffstat (limited to 'hs20')
| -rw-r--r-- | hs20/client/est.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/hs20/client/est.c b/hs20/client/est.c index ec05bc4e..c22d9ca2 100644 --- a/hs20/client/est.c +++ b/hs20/client/est.c @@ -27,6 +27,11 @@ static int pkcs7_to_cert(struct hs20_osu_client *ctx, const u8 *pkcs7, size_t len, char *pem_file, char *der_file) { +#ifdef OPENSSL_IS_BORINGSSL + wpa_printf(MSG_ERROR, + "EST: pkcs7_to_cert not yet supported with BoringSSL"); + return -1; +#else /* OPENSSL_IS_BORINGSSL */ PKCS7 *p7 = NULL; const unsigned char *p = pkcs7; STACK_OF(X509) *certs; @@ -89,6 +94,7 @@ fail: BIO_free_all(out); return ret; +#endif /* OPENSSL_IS_BORINGSSL */ } @@ -216,6 +222,8 @@ ASN1_CHOICE(CsrAttrs) = { IMPLEMENT_ASN1_FUNCTIONS(CsrAttrs); +#ifndef OPENSSL_IS_BORINGSSL + static void add_csrattrs_oid(struct hs20_osu_client *ctx, ASN1_OBJECT *oid, STACK_OF(X509_EXTENSION) *exts) { @@ -324,11 +332,18 @@ static void add_csrattrs(struct hs20_osu_client *ctx, CsrAttrs *csrattrs, } } +#endif /* OPENSSL_IS_BORINGSSL */ + static int generate_csr(struct hs20_osu_client *ctx, char *key_pem, char *csr_pem, char *est_req, char *old_cert, CsrAttrs *csrattrs) { +#ifdef OPENSSL_IS_BORINGSSL + wpa_printf(MSG_ERROR, + "EST: CSR generation not yet supported with BoringSSL"); + return -1; +#else /* OPENSSL_IS_BORINGSSL */ EVP_PKEY_CTX *pctx = NULL; EVP_PKEY *pkey = NULL; RSA *rsa; @@ -535,6 +550,7 @@ fail: if (pctx) EVP_PKEY_CTX_free(pctx); return ret; +#endif /* OPENSSL_IS_BORINGSSL */ } |