KNF.

2 files changed, 50 insertions, 47 deletions

diff --git a/src/regress/lib/libcrypto/aead/aeadtest.c b/src/regress/lib/libcrypto/aead/aeadtest.c
index e74b9fca97..4d96ed6de4 100644
--- a/src/regress/lib/libcrypto/aead/aeadtest.c
+++ b/src/regress/lib/libcrypto/aead/aeadtest.c
@@ -99,7 +99,8 @@ static const char NAMES[NUM_TYPES][6] = {
 };
 
 static unsigned char
-hex_digit(char h) {
+hex_digit(char h)
+{
         if (h >= '0' && h <= '9')
                 return h - '0';
         else if (h >= 'a' && h <= 'f')
@@ -144,7 +145,7 @@ run_test_case(const EVP_AEAD* aead, unsigned char bufs[NUM_TYPES][BUF_MAX],
         EVP_AEAD_CTX ctx;
         ssize_t n;
         size_t un;
-        unsigned char out[BUF_MAX+EVP_AEAD_MAX_TAG_LENGTH], out2[BUF_MAX];
+        unsigned char out[BUF_MAX + EVP_AEAD_MAX_TAG_LENGTH], out2[BUF_MAX];
 
         if (!EVP_AEAD_CTX_init(&ctx, aead, bufs[KEY], lengths[KEY],
             lengths[TAG], NULL)) {
@@ -164,8 +165,8 @@ run_test_case(const EVP_AEAD* aead, unsigned char bufs[NUM_TYPES][BUF_MAX],
 
         if (un != lengths[CT] + lengths[TAG]) {
                 fprintf(stderr, "Bad output length on line %u: %u vs %u\n",
-                        line_no, (unsigned) un,
-                        (unsigned)(lengths[CT] + lengths[TAG]));
+                    line_no, (unsigned) un,
+                    (unsigned)(lengths[CT] + lengths[TAG]));
                 return 0;
         }
 
@@ -188,7 +189,7 @@ run_test_case(const EVP_AEAD* aead, unsigned char bufs[NUM_TYPES][BUF_MAX],
 
         if ((size_t)n != lengths[IN]) {
                 fprintf(stderr, "Bad decrypt on line %u: %u\n", line_no,
-                        (unsigned) n);
+                    (unsigned) n);
                 return 0;
         }
 
@@ -263,7 +264,7 @@ main(int argc, char **argv)
                                 fprintf(stderr, "Aborting...\n");
                                 return 4;
                         }
-                        
+
                         if (!run_test_case(aead, bufs, lengths, line_no))
                                 return 4;
 
diff --git a/src/regress/lib/libcrypto/poly1305/poly1305test.c b/src/regress/lib/libcrypto/poly1305/poly1305test.c
index 96b34c0218..91e296e39f 100644
--- a/src/regress/lib/libcrypto/poly1305/poly1305test.c
+++ b/src/regress/lib/libcrypto/poly1305/poly1305test.c
@@ -16,7 +16,7 @@ int poly1305_power_on_self_test(void);
 
 void
 poly1305_auth(unsigned char mac[16], const unsigned char *m, size_t bytes,
-    const unsigned char key[32]) {
+const unsigned char key[32]) {
         poly1305_context ctx;
         CRYPTO_poly1305_init(&ctx, key);
         CRYPTO_poly1305_update(&ctx, m, bytes);
@@ -24,7 +24,8 @@ poly1305_auth(unsigned char mac[16], const unsigned char *m, size_t bytes,
 }
 
 int
-poly1305_verify(const unsigned char mac1[16], const unsigned char mac2[16]) {
+poly1305_verify(const unsigned char mac1[16], const unsigned char mac2[16])
+{
         size_t i;
         unsigned int dif = 0;
         for (i = 0; i < 16; i++)
@@ -35,56 +36,57 @@ poly1305_verify(const unsigned char mac1[16], const unsigned char mac2[16]) {
 
 /* test a few basic operations */
 int
-poly1305_power_on_self_test(void) {
+poly1305_power_on_self_test(void)
+{
         /* example from nacl */
         static const unsigned char nacl_key[32] = {
-                0xee,0xa6,0xa7,0x25,0x1c,0x1e,0x72,0x91,
-                0x6d,0x11,0xc2,0xcb,0x21,0x4d,0x3c,0x25,
-                0x25,0x39,0x12,0x1d,0x8e,0x23,0x4e,0x65,
-                0x2d,0x65,0x1f,0xa4,0xc8,0xcf,0xf8,0x80,
+                0xee, 0xa6, 0xa7, 0x25, 0x1c, 0x1e, 0x72, 0x91,
+                0x6d, 0x11, 0xc2, 0xcb, 0x21, 0x4d, 0x3c, 0x25,
+                0x25, 0x39, 0x12, 0x1d, 0x8e, 0x23, 0x4e, 0x65,
+                0x2d, 0x65, 0x1f, 0xa4, 0xc8, 0xcf, 0xf8, 0x80,
         };
 
         static const unsigned char nacl_msg[131] = {
-                0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73,
-                0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
-                0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4,
-                0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
-                0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b,
-                0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72,
-                0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2,
-                0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38,
-                0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a,
-                0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae,
-                0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea,
-                0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda,
-                0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde,
-                0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3,
-                0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6,
-                0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74,
-                0xe3,0x55,0xa5
+                0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
+                0xc2, 0x96, 0x50, 0xba, 0x32, 0xfc, 0x76, 0xce,
+                0x48, 0x33, 0x2e, 0xa7, 0x16, 0x4d, 0x96, 0xa4,
+                0x47, 0x6f, 0xb8, 0xc5, 0x31, 0xa1, 0x18, 0x6a,
+                0xc0, 0xdf, 0xc1, 0x7c, 0x98, 0xdc, 0xe8, 0x7b,
+                0x4d, 0xa7, 0xf0, 0x11, 0xec, 0x48, 0xc9, 0x72,
+                0x71, 0xd2, 0xc2, 0x0f, 0x9b, 0x92, 0x8f, 0xe2,
+                0x27, 0x0d, 0x6f, 0xb8, 0x63, 0xd5, 0x17, 0x38,
+                0xb4, 0x8e, 0xee, 0xe3, 0x14, 0xa7, 0xcc, 0x8a,
+                0xb9, 0x32, 0x16, 0x45, 0x48, 0xe5, 0x26, 0xae,
+                0x90, 0x22, 0x43, 0x68, 0x51, 0x7a, 0xcf, 0xea,
+                0xbd, 0x6b, 0xb3, 0x73, 0x2b, 0xc0, 0xe9, 0xda,
+                0x99, 0x83, 0x2b, 0x61, 0xca, 0x01, 0xb6, 0xde,
+                0x56, 0x24, 0x4a, 0x9e, 0x88, 0xd5, 0xf9, 0xb3,
+                0x79, 0x73, 0xf6, 0x22, 0xa4, 0x3d, 0x14, 0xa6,
+                0x59, 0x9b, 0x1f, 0x65, 0x4c, 0xb4, 0x5a, 0x74,
+                0xe3, 0x55, 0xa5
         };
 
         static const unsigned char nacl_mac[16] = {
-                0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5,
-                0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9
+                0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
+                0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9
         };
 
         /* generates a final value of (2^130 - 2) == 3 */
         static const unsigned char wrap_key[32] = {
-                0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         };
 
         static const unsigned char wrap_msg[16] = {
-                0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-                0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
         };
 
         static const unsigned char wrap_mac[16] = {
-                0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         };
 
         /*
@@ -92,15 +94,15 @@ poly1305_power_on_self_test(void) {
                 have all their values set to the length
         */
         static const unsigned char total_key[32] = {
-                0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-                0xff,0xfe,0xfd,0xfc,0xfb,0xfa,0xf9,
-                0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-                0xff,0xff,0xff,0xff,0xff,0xff,0xff
+                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
         };
 
         static const unsigned char total_mac[16] = {
-                0x64,0xaf,0xe2,0xe8,0xd6,0xad,0x7b,0xbd,
-                0xd2,0x87,0xf9,0x7c,0x44,0x62,0x3d,0x39
+                0x64, 0xaf, 0xe2, 0xe8, 0xd6, 0xad, 0x7b, 0xbd,
+                0xd2, 0x87, 0xf9, 0x7c, 0x44, 0x62, 0x3d, 0x39
         };
 
         poly1305_context ctx;
@@ -161,6 +163,6 @@ main(int argc, char **argv)
                 fprintf(stderr, "One or more self tests failed!\n");
                 return 1;
         }
-        
+
         return 0;
 }