diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-07-16 02:08:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-16 02:08:52 +0000 |
| commit | 978e569e76d4051bc187bc7ca14ac1288da9d163 (patch) | |
| tree | 2b8a53d8c2105fc4c454b4a694b47c27202ac44d /hs20 | |
| parent | f8b1050636df77d31ad52869edb60609850b8de7 (diff) | |
| parent | 74423180cf2aeb0aa78d763c2da4f8384eceb124 (diff) | |
| download | wpa_supplicant_8-978e569e76d4051bc187bc7ca14ac1288da9d163.tar.gz | |
Merge "Remove a host of incorrect OPENSSL_IS_BORINGSSL ifdefs" am: 5816616438 am: 527a96f5c4 am: 3e0f594533 am: 370ca7de61 am: 74423180cf
Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2123558
Change-Id: I3beb7ced495169089c75e5292c97d05523d50032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'hs20')
| -rw-r--r-- | hs20/client/est.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/hs20/client/est.c b/hs20/client/est.c index 97f91321..c3f27e1e 100644 --- a/hs20/client/est.c +++ b/hs20/client/est.c @@ -17,9 +17,7 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> #include <openssl/opensslv.h> -#ifdef OPENSSL_IS_BORINGSSL -#include <openssl/buf.h> -#endif /* OPENSSL_IS_BORINGSSL */ +#include <openssl/buffer.h> #include "common.h" #include "utils/base64.h" @@ -220,9 +218,7 @@ typedef struct { } d; } AttrOrOID; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_IS_BORINGSSL) DEFINE_STACK_OF(AttrOrOID) -#endif typedef struct { int type; @@ -340,30 +336,13 @@ static void add_csrattrs(struct hs20_osu_client *ctx, CsrAttrs *csrattrs, if (!csrattrs || ! csrattrs->attrs) return; -#ifdef OPENSSL_IS_BORINGSSL - num = sk_num(CHECKED_CAST(_STACK *, STACK_OF(AttrOrOID) *, - csrattrs->attrs)); - for (i = 0; i < num; i++) { - AttrOrOID *ao = sk_value( - CHECKED_CAST(_STACK *, const STACK_OF(AttrOrOID) *, - csrattrs->attrs), i); - switch (ao->type) { - case 0: - add_csrattrs_oid(ctx, ao->d.oid, exts); - break; - case 1: - add_csrattrs_attr(ctx, ao->d.attribute, exts); - break; - } - } -#else /* OPENSSL_IS_BORINGSSL */ -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_IS_BORINGSSL) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L num = sk_AttrOrOID_num(csrattrs->attrs); #else num = SKM_sk_num(AttrOrOID, csrattrs->attrs); #endif for (i = 0; i < num; i++) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_IS_BORINGSSL) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L AttrOrOID *ao = sk_AttrOrOID_value(csrattrs->attrs, i); #else AttrOrOID *ao = SKM_sk_value(AttrOrOID, csrattrs->attrs, i); @@ -377,7 +356,6 @@ static void add_csrattrs(struct hs20_osu_client *ctx, CsrAttrs *csrattrs, break; } } -#endif /* OPENSSL_IS_BORINGSSL */ } |