diff options
| author | David Benjamin <davidben@google.com> | 2016-10-19 01:09:12 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-10-19 14:31:07 -0400 |
| commit | 95add82835138f09cf7bb4a51c04c6320c241674 (patch) | |
| tree | 0349da4d2b3fee67293e70181cc4e2296ff1ce9e /src/crypto/x509v3 | |
| parent | bb1ceac29bc7a18b94e3da78057dc41aa7071784 (diff) | |
| download | boringssl-95add82835138f09cf7bb4a51c04c6320c241674.tar.gz | |
external/boringssl: Sync to 3ef7697ed30f28367395a5aafb57a12a19906d96.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/3cbdc34619daafb9f8527fb9dd27afc8ee7dcf19..3ef7697ed30f28367395a5aafb57a12a19906d96
This also updates the UPDATING script to create the git commit
automatically.
Test: make checkbuild
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I9e785971e5be19daf29697f010c3ae4e1ca70b04
Diffstat (limited to 'src/crypto/x509v3')
| -rw-r--r-- | src/crypto/x509v3/pcy_int.h | 4 | ||||
| -rw-r--r-- | src/crypto/x509v3/v3_purp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/x509v3/pcy_int.h b/src/crypto/x509v3/pcy_int.h index b5075f9e..1e765037 100644 --- a/src/crypto/x509v3/pcy_int.h +++ b/src/crypto/x509v3/pcy_int.h @@ -180,8 +180,8 @@ struct X509_POLICY_TREE_st { /* Useful macros */ -#define node_data_critical(data) (data->flags & POLICY_DATA_FLAG_CRITICAL) -#define node_critical(node) node_data_critical(node->data) +#define node_data_critical(data) ((data)->flags & POLICY_DATA_FLAG_CRITICAL) +#define node_critical(node) node_data_critical((node)->data) /* Internal functions */ diff --git a/src/crypto/x509v3/v3_purp.c b/src/crypto/x509v3/v3_purp.c index f9324d4e..91524444 100644 --- a/src/crypto/x509v3/v3_purp.c +++ b/src/crypto/x509v3/v3_purp.c @@ -647,7 +647,7 @@ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, * key types. */ #define KU_TLS \ - KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT|KU_KEY_AGREEMENT + (KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT|KU_KEY_AGREEMENT) static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca) |