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>
This commit is contained in:
David Benjamin
2022-06-22 20:22:51 +00:00
committed by Boringssl LUCI CQ
parent 46350487c1
commit 520ad645d2
5 changed files with 16 additions and 14 deletions
-1
View File
@@ -58,7 +58,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <time.h>
#include <openssl/bn.h>
#include <openssl/digest.h>
-3
View File
@@ -435,9 +435,6 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
// 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;
}
}
+8 -4
View File
@@ -323,7 +323,8 @@ int x509_print_rsa_pss_params(BIO *bp, const X509_ALGOR *sigalg, int indent,
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 @@ int x509_print_rsa_pss_params(BIO *bp, const X509_ALGOR *sigalg, int indent,
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 @@ int x509_print_rsa_pss_params(BIO *bp, const X509_ALGOR *sigalg, int indent,
}
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 @@ int x509_print_rsa_pss_params(BIO *bp, const X509_ALGOR *sigalg, int indent,
}
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;
}
+4 -2
View File
@@ -97,8 +97,10 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) {
}
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;
+4 -4
View File
@@ -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)