diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-10-10 00:06:14 +0300 |
|---|---|---|
| committer | Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> | 2016-01-11 07:59:35 +0530 |
| commit | 667e816f992fc998d5da2410055bb9e35ca78e51 (patch) | |
| tree | 763cedf44d8556e667540de0e7c4a82854530a6e /src | |
| parent | af862cc4eda76680be096c7b554a224171db3a06 (diff) | |
| download | android_external_wpa_supplicant_8-667e816f992fc998d5da2410055bb9e35ca78e51.tar.gz android_external_wpa_supplicant_8-667e816f992fc998d5da2410055bb9e35ca78e51.tar.bz2 android_external_wpa_supplicant_8-667e816f992fc998d5da2410055bb9e35ca78e51.zip | |
HTTP (curl): Fix compilation with BoringSSL
Define the sk_*_{num,value}() macros in BoringSSL style if BoringSSL is
used instead of OpenSSL.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: cc2994024d859ecf60a48e81723e9b5838012dd3
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: Ib63e49df46392fa677e0562ba866f9e1feb1b6f4
CRs-fixed: 960177
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/http_curl.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/utils/http_curl.c b/src/utils/http_curl.c index 653eb541..df2ce833 100644 --- a/src/utils/http_curl.c +++ b/src/utils/http_curl.c @@ -421,6 +421,28 @@ ASN1_SEQUENCE(LogotypeExtn) = { IMPLEMENT_ASN1_FUNCTIONS(LogotypeExtn); +#ifdef OPENSSL_IS_BORINGSSL +#define sk_LogotypeInfo_num(st) \ +sk_num(CHECKED_CAST(_STACK *, STACK_OF(LogotypeInfo) *, (st))) +#define sk_LogotypeInfo_value(st, i) (LogotypeInfo *) \ +sk_value(CHECKED_CAST(_STACK *, const STACK_OF(LogotypeInfo) *, (st)), (i)) +#define sk_LogotypeImage_num(st) \ +sk_num(CHECKED_CAST(_STACK *, STACK_OF(LogotypeImage) *, (st))) +#define sk_LogotypeImage_value(st, i) (LogotypeImage *) \ +sk_value(CHECKED_CAST(_STACK *, const STACK_OF(LogotypeImage) *, (st)), (i)) +#define sk_LogotypeAudio_num(st) \ +sk_num(CHECKED_CAST(_STACK *, STACK_OF(LogotypeAudio) *, (st))) +#define sk_LogotypeAudio_value(st, i) (LogotypeAudio *) \ +sk_value(CHECK_CAST(_STACK *, const STACK_OF(LogotypeAudio) *, (st)), (i)) +#define sk_HashAlgAndValue_num(st) \ +sk_num(CHECKED_CAST(_STACK *, STACK_OF(HashAlgAndValue) *, (st))) +#define sk_HashAlgAndValue_value(st, i) (HashAlgAndValue *) \ +sk_value(CHECKED_CAST(_STACK *, const STACK_OF(HashAlgAndValue) *, (st)), (i)) +#define sk_ASN1_IA5STRING_num(st) \ +sk_num(CHECKED_CAST(_STACK *, STACK_OF(ASN1_IA5STRING) *, (st))) +#define sk_ASN1_IA5STRING_value(st, i) (ASN1_IA5STRING *) \ +sk_value(CHECKED_CAST(_STACK *, const STACK_OF(ASN1_IA5STRING) *, (st)), (i)) +#else /* OPENSSL_IS_BORINGSSL */ #define sk_LogotypeInfo_num(st) SKM_sk_num(LogotypeInfo, (st)) #define sk_LogotypeInfo_value(st, i) SKM_sk_value(LogotypeInfo, (st), (i)) #define sk_LogotypeImage_num(st) SKM_sk_num(LogotypeImage, (st)) @@ -431,6 +453,7 @@ IMPLEMENT_ASN1_FUNCTIONS(LogotypeExtn); #define sk_HashAlgAndValue_value(st, i) SKM_sk_value(HashAlgAndValue, (st), (i)) #define sk_ASN1_IA5STRING_num(st) SKM_sk_num(ASN1_IA5STRING, (st)) #define sk_ASN1_IA5STRING_value(st, i) SKM_sk_value(ASN1_IA5STRING, (st), (i)) +#endif /* OPENSSL_IS_BORINGSSL */ static void add_logo(struct http_ctx *ctx, struct http_cert *hcert, |