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/x509/x509_vpm.c | |
| 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/x509/x509_vpm.c')
| -rw-r--r-- | src/crypto/x509/x509_vpm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/x509/x509_vpm.c b/src/crypto/x509/x509_vpm.c index 9e9dbf5e..924cfa7c 100644 --- a/src/crypto/x509/x509_vpm.c +++ b/src/crypto/x509/x509_vpm.c @@ -227,8 +227,8 @@ void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param) /* Macro to test if a field should be copied from src to dest */ #define test_x509_verify_param_copy(field, def) \ - (to_overwrite || \ - ((src->field != def) && (to_default || (dest->field == def)))) + (to_overwrite || \ + ((src->field != (def)) && (to_default || (dest->field == (def))))) /* As above but for ID fields */ @@ -513,7 +513,7 @@ const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param) static const X509_VERIFY_PARAM_ID _empty_id = { NULL, 0U, NULL, NULL, 0, NULL, 0 }; -#define vpm_empty_id (X509_VERIFY_PARAM_ID *)&_empty_id +#define vpm_empty_id ((X509_VERIFY_PARAM_ID *)&_empty_id) /* * Default verify parameters: these are used for various applications and can |