ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'each-style-tweak' into 'master'

Browse Source 
adjust clang-format options to get closer to ISC style

See merge request isc-projects/bind9!3061

(cherry picked from commit d3b49b6675)

0255a974 revise .clang-format and add a C formatting script in util
e851ed0b apply the modified style
This commit is contained in:
Ondřej Surý
2020-02-14 05:35:17 +00:00
parent c646c20e79
commit cdef20bb66
672 changed files with 36044 additions and 42228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/isc/aes.c
View File

@@ -22,21 +22,20 @@
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context)
#define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context)
#define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1)
#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \
* defined(LIBRESSL_VERSION_NUMBER) */
void
isc_aes128_crypt(const unsigned char *key, const unsigned char *in,
unsigned char *out)
{
unsigned char *out) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX _context;
#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \
* defined(LIBRESSL_VERSION_NUMBER) */
EVP_CIPHER_CTX *c;
int len;
int len;
c = EVP_CIPHER_CTX_new();
RUNTIME_CHECK(c != NULL);
@@ -50,14 +49,13 @@ isc_aes128_crypt(const unsigned char *key, const unsigned char *in,
void
isc_aes192_crypt(const unsigned char *key, const unsigned char *in,
unsigned char *out)
{
unsigned char *out) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX _context;
#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \
* defined(LIBRESSL_VERSION_NUMBER) */
EVP_CIPHER_CTX *c;
int len;
int len;
c = EVP_CIPHER_CTX_new();
RUNTIME_CHECK(c != NULL);
@@ -71,14 +69,13 @@ isc_aes192_crypt(const unsigned char *key, const unsigned char *in,
void
isc_aes256_crypt(const unsigned char *key, const unsigned char *in,
unsigned char *out)
{
unsigned char *out) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
EVP_CIPHER_CTX _context;
#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \
* defined(LIBRESSL_VERSION_NUMBER) */
EVP_CIPHER_CTX *c;
int len;
int len;
c = EVP_CIPHER_CTX_new();
RUNTIME_CHECK(c != NULL);