summaryrefslogtreecommitdiff
path: root/src/.clang-format
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-10-10 14:42:17 +0100
committerPete Bentley <prb@google.com>2020-10-10 17:16:52 +0100
commit92a0f790a5c96b3f6e0516a20aca2222459be9cd (patch)
treedfb279d81d909a72c07f8cb4dce1933ca5ea2da8 /src/.clang-format
parent28e460f29b0db01ee1da2b0e4af010b7e363be90 (diff)
downloadboringssl-92a0f790a5c96b3f6e0516a20aca2222459be9cd.tar.gz
external/boringssl: Sync to 3989c99706bf30054798ff82f1cb010e50e385f5.
This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/3743aafdacff2f7b083615a043a37101f740fa53..3989c99706bf30054798ff82f1cb010e50e385f5 * Fix crash when flushing an SSL BIO. * Document low-level PEM read/write functions. * clang-format pem.h and convert comments. * Add PSK variants of HPKE setup functions to BoGo. * acvp: abstract out MCT iteration functions. * Add Go implementation of HPKE draft 05 to runner. * runner: Implement a more complete ClientHello consistency check. * Update TrustTokenV2 to use VOPRFs and assemble RR. * acvp: add AES-CCM support. * acvp: highlight that the TOTP secret goes in the config file. * acvp: handle more private key formats. * runner: Refactor BoGo clientHelloMsg extension marshalling. * Include rodata subsections in FIPS-shared build. * Switch x509_test.cc to use C++ raw string literals. * Fix some malloc error handling. * acvp: add AES-KWP support. * acvp: add AES-KW support. * acvp: support saving vectors. * Fix handling of quic_early_data_context. * Add a warning to des.h. * Move Trusty workaround to the OPENSSL_LINUX define. * acvp: add AES-GCM support. * Disable fork detection on Trusty. * acvp: add AES-CTR support. * Tell clang-format that STACK_OF and LHASH_OF are types. * modulewrapper: fix unknown functions. * Print SSL_get_error in bssl_shim. * modulewrapper: fix sending empty spans. * Allow specifying different initial and resumption expectations. * Add a few more OPENSSL_NO_* constants. * Test SSL_get0_alpn_selected on both client and server. * runner: Rewrite sessionState parsing with byteReader. * Switch ssl_parse_extensions to bool and Span. * Disable check that X.509 extensions implies v3. * Silence some clang warnings on macOS and iOS CQ bots. * Mirror dsa.h's deprecation notice in dh.h. * Const-correct X509_get0_extensions. Update-Note: Callers may need to update their calls of X509_get0_extensions, but I believe everything affected has been fixed. Bug: 160351436 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: I591546ce4deac518352bb625537073aca1465d35
Diffstat (limited to 'src/.clang-format')
-rw-r--r--src/.clang-format36
1 files changed, 35 insertions, 1 deletions
diff --git a/src/.clang-format b/src/.clang-format
index 3ccecaac..55644fa3 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -8,4 +8,38 @@ PointerAlignment: Right
# IncludeCategories does not recognize <openssl/header.h>. We should
# reconfigure IncludeCategories to match. For now, keep it at Preserve.
IncludeBlocks: Preserve
-
+TypenameMacros: ['LHASH_OF', 'STACK_OF']
+StatementMacros:
+ - "DECLARE_PEM_read"
+ - "DECLARE_PEM_read_bio"
+ - "DECLARE_PEM_read_fp"
+ - "DECLARE_PEM_rw"
+ - "DECLARE_PEM_rw_cb"
+ - "DECLARE_PEM_rw_const"
+ - "DECLARE_PEM_write"
+ - "DECLARE_PEM_write_bio"
+ - "DECLARE_PEM_write_bio_const"
+ - "DECLARE_PEM_write_cb"
+ - "DECLARE_PEM_write_cb_bio"
+ - "DECLARE_PEM_write_cb_fp"
+ - "DECLARE_PEM_write_const"
+ - "DECLARE_PEM_write_fp"
+ - "DECLARE_PEM_write_fp_const"
+ - "IMPLEMENT_PEM_read"
+ - "IMPLEMENT_PEM_read_bio"
+ - "IMPLEMENT_PEM_read_fp"
+ - "IMPLEMENT_PEM_rw"
+ - "IMPLEMENT_PEM_rw_cb"
+ - "IMPLEMENT_PEM_rw_const"
+ - "IMPLEMENT_PEM_write"
+ - "IMPLEMENT_PEM_write_bio"
+ - "IMPLEMENT_PEM_write_bio_const"
+ - "IMPLEMENT_PEM_write_cb"
+ - "IMPLEMENT_PEM_write_cb_bio"
+ - "IMPLEMENT_PEM_write_cb_bio_const"
+ - "IMPLEMENT_PEM_write_cb_const"
+ - "IMPLEMENT_PEM_write_cb_fp"
+ - "IMPLEMENT_PEM_write_cb_fp_const"
+ - "IMPLEMENT_PEM_write_const"
+ - "IMPLEMENT_PEM_write_fp"
+ - "IMPLEMENT_PEM_write_fp_const"