Post-clang-format fixups. Some things that I noticed paging through. Change-Id: I41e5e12b743fd996f5ff91d19f6edc074169f629 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/53088 Commit-Queue: Bob Beck <bbe@google.com> Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/crypto/x509/a_verify.c b/crypto/x509/a_verify.c index d9bb235..af2c914 100644 --- a/crypto/x509/a_verify.c +++ b/crypto/x509/a_verify.c
@@ -58,7 +58,6 @@ #include <stdio.h> #include <sys/types.h> -#include <time.h> #include <openssl/bn.h> #include <openssl/digest.h>
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 9af3d00..91d16d0 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c
@@ -435,9 +435,6 @@ // If we were going to up the reference count, we would need // to do it on a perl 'type' basis - // - // CRYPTO_add(&tmp->data.x509->references,1, - // CRYPTO_LOCK_X509); goto finish; } }
diff --git a/crypto/x509/rsa_pss.c b/crypto/x509/rsa_pss.c index 049e6bc..38cb028 100644 --- a/crypto/x509/rsa_pss.c +++ b/crypto/x509/rsa_pss.c
@@ -323,7 +323,8 @@ goto err; } - if (BIO_puts(bp, "\n") <= 0 || !BIO_indent(bp, indent, 128) || + if (BIO_puts(bp, "\n") <= 0 || // + !BIO_indent(bp, indent, 128) || // BIO_puts(bp, "Hash Algorithm: ") <= 0) { goto err; } @@ -336,7 +337,8 @@ goto err; } - if (BIO_puts(bp, "\n") <= 0 || !BIO_indent(bp, indent, 128) || + if (BIO_puts(bp, "\n") <= 0 || // + !BIO_indent(bp, indent, 128) || // BIO_puts(bp, "Mask Algorithm: ") <= 0) { goto err; } @@ -359,7 +361,8 @@ } BIO_puts(bp, "\n"); - if (!BIO_indent(bp, indent, 128) || BIO_puts(bp, "Salt Length: 0x") <= 0) { + if (!BIO_indent(bp, indent, 128) || // + BIO_puts(bp, "Salt Length: 0x") <= 0) { goto err; } @@ -372,7 +375,8 @@ } BIO_puts(bp, "\n"); - if (!BIO_indent(bp, indent, 128) || BIO_puts(bp, "Trailer Field: 0x") <= 0) { + if (!BIO_indent(bp, indent, 128) || // + BIO_puts(bp, "Trailer Field: 0x") <= 0) { goto err; }
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c index 3a19135..d56e6fe 100644 --- a/crypto/x509/x_pubkey.c +++ b/crypto/x509/x_pubkey.c
@@ -97,8 +97,10 @@ } CBB cbb; - if (!CBB_init(&cbb, 0) || !EVP_marshal_public_key(&cbb, pkey) || - !CBB_finish(&cbb, &spki, &spki_len) || spki_len > LONG_MAX) { + if (!CBB_init(&cbb, 0) || // + !EVP_marshal_public_key(&cbb, pkey) || + !CBB_finish(&cbb, &spki, &spki_len) || // + spki_len > LONG_MAX) { CBB_cleanup(&cbb); OPENSSL_PUT_ERROR(X509, X509_R_PUBLIC_KEY_ENCODE_ERROR); goto error;
diff --git a/crypto/x509v3/v3_pcia.c b/crypto/x509v3/v3_pcia.c index 1e92ad7..356fb9d 100644 --- a/crypto/x509v3/v3_pcia.c +++ b/crypto/x509v3/v3_pcia.c
@@ -42,14 +42,14 @@ ASN1_SEQUENCE(PROXY_POLICY) = { ASN1_SIMPLE(PROXY_POLICY, policyLanguage, ASN1_OBJECT), - ASN1_OPT(PROXY_POLICY, policy, - ASN1_OCTET_STRING)} ASN1_SEQUENCE_END(PROXY_POLICY) + ASN1_OPT(PROXY_POLICY, policy, ASN1_OCTET_STRING), +} ASN1_SEQUENCE_END(PROXY_POLICY) IMPLEMENT_ASN1_FUNCTIONS(PROXY_POLICY) ASN1_SEQUENCE(PROXY_CERT_INFO_EXTENSION) = { ASN1_OPT(PROXY_CERT_INFO_EXTENSION, pcPathLengthConstraint, ASN1_INTEGER), - ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, - PROXY_POLICY)} ASN1_SEQUENCE_END(PROXY_CERT_INFO_EXTENSION) + ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, PROXY_POLICY), +} ASN1_SEQUENCE_END(PROXY_CERT_INFO_EXTENSION) IMPLEMENT_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)