diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-04-19 21:12:34 +0900 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-26 16:56:36 +0100 |
| commit | bf5c84f5d17ed68076ba1faa4a9eaaf4f51e4bf1 (patch) | |
| tree | ff79efac4f5addb092f430b79a1ffc08fe36f2fa | |
| parent | 735d5b59df341236a6c9bb51ebdfebf9119ebeab (diff) | |
| download | openssl-bf5c84f5d17ed68076ba1faa4a9eaaf4f51e4bf1.tar.gz | |
Break before && operator
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3244)
| -rw-r--r-- | ssl/statem/extensions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 54075ae0e6..f892675c0b 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -499,9 +499,9 @@ int tls_collect_extensions(SSL *s, PACKET *packet, unsigned int context, */ for (thisexd = ext_defs, i = 0; i < OSSL_NELEM(ext_defs); i++, thisexd++) { - if (thisexd->init != NULL && (thisexd->context & context) != 0 && - extension_is_relevant(s, thisexd->context, context) && - !thisexd->init(s, context)) { + if (thisexd->init != NULL && (thisexd->context & context) != 0 + && extension_is_relevant(s, thisexd->context, context) + && !thisexd->init(s, context)) { *al = SSL_AD_INTERNAL_ERROR; goto err; } @@ -611,8 +611,8 @@ int tls_parse_all_extensions(SSL *s, int context, RAW_EXTENSION *exts, X509 *x, */ for (i = 0, thisexd = ext_defs; i < OSSL_NELEM(ext_defs); i++, thisexd++) { - if (thisexd->final != NULL && (thisexd->context & context) != 0 && - !thisexd->final(s, context, exts[i].present, al)) + if (thisexd->final != NULL && (thisexd->context & context) != 0 + && !thisexd->final(s, context, exts[i].present, al)) return 0; } } |