[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: get rid of c99-isms
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: get rid of c99-isms |
|
Date: |
Sun, 13 Oct 2019 20:37:25 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new b84ae2b6 get rid of c99-isms
b84ae2b6 is described below
commit b84ae2b67f1cdfebd24585335125423f5f27517d
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Oct 13 20:35:07 2019 +0200
get rid of c99-isms
---
src/microhttpd/test_sha256.c | 495 ++++++++++++++++++++++++++-----------------
1 file changed, 296 insertions(+), 199 deletions(-)
diff --git a/src/microhttpd/test_sha256.c b/src/microhttpd/test_sha256.c
index 4eb0cf69..da6f6e1f 100644
--- a/src/microhttpd/test_sha256.c
+++ b/src/microhttpd/test_sha256.c
@@ -33,7 +33,7 @@ static int verbose = 0; /* verbose level (0-1)*/
struct str_with_len
{
- const char * const str;
+ const char *const str;
const size_t len;
};
@@ -46,31 +46,47 @@ struct data_unit1
};
static const struct data_unit1 data_units1[] = {
- {D_STR_W_LEN("abc"),
- {0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40,
0xde, 0x5d, 0xae, 0x22, 0x23,
- 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff,
0x61, 0xf2, 0x00, 0x15, 0xad}},
- {D_STR_W_LEN("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
- {0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8, 0xe5, 0xc0, 0x26,
0x93, 0x0c, 0x3e, 0x60, 0x39,
- 0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67, 0xf6, 0xec, 0xed,
0xd4, 0x19, 0xdb, 0x06, 0xc1}},
- {D_STR_W_LEN(""),
- {0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4,
0xc8, 0x99, 0x6f, 0xb9, 0x24,
- 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99,
0x1b, 0x78, 0x52, 0xb8, 0x55}},
- {D_STR_W_LEN("1234567890!@~%&$@#{}[]\\/!?`."),
- {0x2f, 0xad, 0x7a, 0xff, 0x7d, 0xfe, 0xcd, 0x78, 0xe4, 0xa6, 0xf3,
0x85, 0x97, 0x9d, 0xdc, 0x39,
- 0x55, 0x24, 0x35, 0x4a, 0x00, 0x6f, 0x42, 0x72, 0x41, 0xc1, 0x52,
0xa7, 0x01, 0x0b, 0x2c, 0x41}},
- {D_STR_W_LEN("Simple string."),
- {0x01, 0x73, 0x17, 0xc4, 0x0a, 0x9a, 0x0e, 0x81, 0xb3, 0xa4, 0xb1,
0x8e, 0xe9, 0xd6, 0xc2, 0xdf,
- 0xfa, 0x7d, 0x53, 0x4e, 0xa1, 0xda, 0xb2, 0x5a, 0x75, 0xbb, 0x2c,
0x30, 0x2f, 0x5f, 0x7a, 0xf4}},
- {D_STR_W_LEN("abcdefghijklmnopqrstuvwxyz"),
- {0x71, 0xc4, 0x80, 0xdf, 0x93, 0xd6, 0xae, 0x2f, 0x1e, 0xfa, 0xd1,
0x44, 0x7c, 0x66, 0xc9, 0x52,
- 0x5e, 0x31, 0x62, 0x18, 0xcf, 0x51, 0xfc, 0x8d, 0x9e, 0xd8, 0x32,
0xf2, 0xda, 0xf1, 0x8b, 0x73}},
- {D_STR_W_LEN("zyxwvutsrqponMLKJIHGFEDCBA"),
- {0xce, 0x7d, 0xde, 0xb6, 0x1f, 0x7c, 0x1d, 0x83, 0x7c, 0x60, 0xd8,
0x36, 0x73, 0x82, 0xac, 0x92,
- 0xca, 0x37, 0xfd, 0x72, 0x8b, 0x0c, 0xd1, 0x6c, 0x55, 0xd5, 0x88,
0x98, 0x24, 0xfa, 0x16, 0xf2}},
- {D_STR_W_LEN("abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"
- "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"),
- {0x27, 0xd1, 0xe8, 0xbc, 0x6a, 0x79, 0x16, 0x83, 0x61, 0x73, 0xa9,
0xa8, 0x9b, 0xaf, 0xaf, 0xcf,
- 0x47, 0x4d, 0x09, 0xef, 0x6d, 0x50, 0x35, 0x12, 0x25, 0x72, 0xd8,
0x68, 0xdc, 0x1f, 0xd2, 0xf4}},
+ {D_STR_W_LEN ("abc"),
+ {0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40, 0xde,
+ 0x5d, 0xae, 0x22, 0x23,
+ 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff, 0x61,
+ 0xf2, 0x00, 0x15, 0xad}},
+ {D_STR_W_LEN ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
+ {0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8, 0xe5, 0xc0, 0x26, 0x93,
+ 0x0c, 0x3e, 0x60, 0x39,
+ 0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67, 0xf6, 0xec, 0xed, 0xd4,
+ 0x19, 0xdb, 0x06, 0xc1}},
+ {D_STR_W_LEN (""),
+ {0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8,
+ 0x99, 0x6f, 0xb9, 0x24,
+ 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b,
+ 0x78, 0x52, 0xb8, 0x55}},
+ {D_STR_W_LEN ("1234567890!@~%&$@#{}[]\\/!?`."),
+ {0x2f, 0xad, 0x7a, 0xff, 0x7d, 0xfe, 0xcd, 0x78, 0xe4, 0xa6, 0xf3, 0x85,
+ 0x97, 0x9d, 0xdc, 0x39,
+ 0x55, 0x24, 0x35, 0x4a, 0x00, 0x6f, 0x42, 0x72, 0x41, 0xc1, 0x52, 0xa7,
+ 0x01, 0x0b, 0x2c, 0x41}},
+ {D_STR_W_LEN ("Simple string."),
+ {0x01, 0x73, 0x17, 0xc4, 0x0a, 0x9a, 0x0e, 0x81, 0xb3, 0xa4, 0xb1, 0x8e,
+ 0xe9, 0xd6, 0xc2, 0xdf,
+ 0xfa, 0x7d, 0x53, 0x4e, 0xa1, 0xda, 0xb2, 0x5a, 0x75, 0xbb, 0x2c, 0x30,
+ 0x2f, 0x5f, 0x7a, 0xf4}},
+ {D_STR_W_LEN ("abcdefghijklmnopqrstuvwxyz"),
+ {0x71, 0xc4, 0x80, 0xdf, 0x93, 0xd6, 0xae, 0x2f, 0x1e, 0xfa, 0xd1, 0x44,
+ 0x7c, 0x66, 0xc9, 0x52,
+ 0x5e, 0x31, 0x62, 0x18, 0xcf, 0x51, 0xfc, 0x8d, 0x9e, 0xd8, 0x32, 0xf2,
+ 0xda, 0xf1, 0x8b, 0x73}},
+ {D_STR_W_LEN ("zyxwvutsrqponMLKJIHGFEDCBA"),
+ {0xce, 0x7d, 0xde, 0xb6, 0x1f, 0x7c, 0x1d, 0x83, 0x7c, 0x60, 0xd8, 0x36,
+ 0x73, 0x82, 0xac, 0x92,
+ 0xca, 0x37, 0xfd, 0x72, 0x8b, 0x0c, 0xd1, 0x6c, 0x55, 0xd5, 0x88, 0x98,
+ 0x24, 0xfa, 0x16, 0xf2}},
+ {D_STR_W_LEN ("abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"
+ "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"),
+ {0x27, 0xd1, 0xe8, 0xbc, 0x6a, 0x79, 0x16, 0x83, 0x61, 0x73, 0xa9, 0xa8,
+ 0x9b, 0xaf, 0xaf, 0xcf,
+ 0x47, 0x4d, 0x09, 0xef, 0x6d, 0x50, 0x35, 0x12, 0x25, 0x72, 0xd8, 0x68,
+ 0xdc, 0x1f, 0xd2, 0xf4}},
};
static const size_t units1_num = sizeof(data_units1) / sizeof(data_units1[0]);
@@ -89,95 +105,154 @@ struct data_unit2
/* Size must be less than 512 bytes! */
static const struct data_unit2 data_units2[] = {
- { { {97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122}, 26},/* a..z ASCII sequence */
- {0x71, 0xc4, 0x80, 0xdf, 0x93, 0xd6, 0xae, 0x2f, 0x1e, 0xfa, 0xd1, 0x44,
0x7c, 0x66, 0xc9, 0x52,
- 0x5e, 0x31, 0x62, 0x18, 0xcf, 0x51, 0xfc, 0x8d, 0x9e, 0xd8, 0x32, 0xf2,
0xda, 0xf1, 0x8b, 0x73}
- },
- { { {65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65
- }, 72 },/* 'A' x 72 times */
- {0x6a, 0x6d, 0x69, 0x1a, 0xc9, 0xba, 0x70, 0x95, 0x50, 0x46, 0x75, 0x7c,
0xd6, 0x85, 0xb6, 0x25,
- 0x77, 0x73, 0xff, 0x3a, 0xd9, 0x3f, 0x43, 0xd4, 0xd4, 0x81, 0x2c, 0x5b,
0x10, 0x6f, 0x4b, 0x5b}
- },
- { { {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73}, 55},/* 19..73 sequence */
- {0x06, 0xe4, 0xb3, 0x9e, 0xf1, 0xfb, 0x6c, 0xcf, 0xd7, 0x3f, 0x50, 0x9e,
0xf4, 0x16, 0x17, 0xd4,
- 0x63, 0x7c, 0x39, 0x1e, 0xa8, 0x0f, 0xa9, 0x88, 0x03, 0x44, 0x98, 0x0e,
0x95, 0x81, 0xf0, 0x2a}
- },
- { { {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69}, 63},/* 7..69
sequence */
- {0x4a, 0xd3, 0xc6, 0x87, 0x1f, 0xd1, 0xc5, 0xe2, 0x3e, 0x52, 0xdc, 0x22,
0xd1, 0x10, 0xd2, 0x05,
- 0x15, 0x23, 0xcd, 0x15, 0xac, 0x24, 0x88, 0x26, 0x02, 0x00, 0x70, 0x78,
0x9f, 0x17, 0xf8, 0xd9}
- },
- { { {38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92}, 55},/* 38..92 sequence */
- {0xe6, 0x03, 0x0f, 0xc9, 0x0d, 0xca, 0x0c, 0x26, 0x41, 0xcf, 0x43, 0x27,
0xec, 0xd6, 0x28, 0x2a,
- 0x98, 0x24, 0x55, 0xd3, 0x5a, 0xed, 0x8b, 0x32, 0x19, 0x78, 0xeb, 0x83,
0x1d, 0x19, 0x92, 0x79}
- },
- { { {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
70, 71, 72},
+ { { {97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122}, 26}, /* a..z ASCII sequence */
+ {0x71, 0xc4, 0x80, 0xdf, 0x93, 0xd6, 0xae, 0x2f, 0x1e, 0xfa, 0xd1, 0x44,
+ 0x7c, 0x66, 0xc9, 0x52,
+ 0x5e, 0x31, 0x62, 0x18, 0xcf, 0x51, 0xfc, 0x8d, 0x9e, 0xd8, 0x32, 0xf2,
+ 0xda, 0xf1, 0x8b, 0x73}},
+ { { {65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 65, 65, 65}, 72 },/* 'A' x 72 times */
+ {0x6a, 0x6d, 0x69, 0x1a, 0xc9, 0xba, 0x70, 0x95, 0x50, 0x46, 0x75, 0x7c,
+ 0xd6, 0x85, 0xb6, 0x25,
+ 0x77, 0x73, 0xff, 0x3a, 0xd9, 0x3f, 0x43, 0xd4, 0xd4, 0x81, 0x2c, 0x5b,
+ 0x10, 0x6f, 0x4b, 0x5b}},
+ { { {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73}, 55}, /* 19..73 sequence */
+ {0x06, 0xe4, 0xb3, 0x9e, 0xf1, 0xfb, 0x6c, 0xcf, 0xd7, 0x3f, 0x50, 0x9e,
+ 0xf4, 0x16, 0x17, 0xd4,
+ 0x63, 0x7c, 0x39, 0x1e, 0xa8, 0x0f, 0xa9, 0x88, 0x03, 0x44, 0x98, 0x0e,
+ 0x95, 0x81, 0xf0, 0x2a}},
+ { { {7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69}, 63}, /* 7..69
sequence */
+ {0x4a, 0xd3, 0xc6, 0x87, 0x1f, 0xd1, 0xc5, 0xe2, 0x3e, 0x52, 0xdc, 0x22,
+ 0xd1, 0x10, 0xd2, 0x05,
+ 0x15, 0x23, 0xcd, 0x15, 0xac, 0x24, 0x88, 0x26, 0x02, 0x00, 0x70, 0x78,
+ 0x9f, 0x17, 0xf8, 0xd9}},
+ { { {38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92}, 55}, /* 38..92 sequence */
+ {0xe6, 0x03, 0x0f, 0xc9, 0x0d, 0xca, 0x0c, 0x26, 0x41, 0xcf, 0x43, 0x27,
+ 0xec, 0xd6, 0x28, 0x2a,
+ 0x98, 0x24, 0x55, 0xd3, 0x5a, 0xed, 0x8b, 0x32, 0x19, 0x78, 0xeb, 0x83,
+ 0x1d, 0x19, 0x92, 0x79}},
+ { { {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72},
72},/* 1..72 sequence */
- {0x87, 0xa2, 0xfa, 0x2e, 0xec, 0x53, 0x05, 0x3c, 0xb1, 0xee, 0x07, 0xd7,
0x59, 0x70, 0xf6, 0x50,
- 0xcd, 0x9d, 0xc5, 0x8b, 0xdc, 0xb8, 0x65, 0x30, 0x4f, 0x70, 0x82, 0x9e,
0xbd, 0xe2, 0x7d, 0xac}
- },
- { { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
175, 176, 177, 178, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
215, 216, 217, 218, 219, 220,
- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
235, 236, 237, 238, 239, 240,
- 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
255}, 256}, /* 0..255 sequence */
- {0x40, 0xaf, 0xf2, 0xe9, 0xd2, 0xd8, 0x92, 0x2e, 0x47, 0xaf, 0xd4, 0x64,
0x8e, 0x69, 0x67, 0x49,
- 0x71, 0x58, 0x78, 0x5f, 0xbd, 0x1d, 0xa8, 0x70, 0xe7, 0x11, 0x02, 0x66,
0xbf, 0x94, 0x48, 0x80}
- },
- { { {199, 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, 186,
185, 184, 183, 182, 181, 180,
- 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166,
165, 164, 163, 162, 161, 160,
- 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146,
145, 144, 143, 142, 141, 140,
- 139}, 61}, /* 199..139 sequence */
- {0x85, 0xf8, 0xa2, 0x83, 0xd6, 0x3c, 0x76, 0x8e, 0xea, 0x8f, 0x1c, 0x57,
0x2d, 0x85, 0xb6, 0xff,
- 0xd8, 0x33, 0x57, 0x62, 0x1d, 0x37, 0xae, 0x0e, 0xfc, 0x22, 0xd3, 0xd5,
0x8f, 0x53, 0x21, 0xb7}
- },
- { { {255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242,
241, 240, 239, 238, 237, 236,
- 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, 222,
221, 220, 219, 218, 217, 216,
- 215, 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, 202,
201, 200, 199, 198, 197, 196,
- 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182,
181, 180, 179, 178, 177, 176,
- 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162,
161, 160, 159, 158, 157, 156,
- 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, 143, 142,
141, 140, 139, 138, 137, 136,
- 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122,
121, 120, 119, 118, 117, 116,
- 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102,
101, 100, 99, 98, 97, 96, 95,
- 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78,
77, 76, 75, 74, 73, 72, 71, 70,
- 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53,
52, 51, 50, 49, 48, 47, 46, 45,
- 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28,
27, 26, 25, 24, 23, 22, 21, 20,
- 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1},
255}, /* 255..1 sequence */
- {0x61, 0x86, 0x96, 0xab, 0x3e, 0xaa, 0x0e, 0x64, 0xb2, 0xf7, 0x2d, 0x75,
0x47, 0x5a, 0x14, 0x97,
- 0xa3, 0x3d, 0x59, 0xa4, 0x08, 0xd9, 0x9e, 0x73, 0xf2, 0x78, 0x00, 0x5b,
0x4b, 0x55, 0xca, 0x43}
- },
- { { {41, 35, 190, 132, 225, 108, 214, 174, 82, 144, 73, 241, 241, 187,
233, 235, 179, 166, 219, 60, 135,
- 12, 62, 153, 36, 94, 13, 28, 6, 183, 71, 222, 179, 18, 77, 200, 67,
187, 139, 166, 31, 3, 90, 125, 9,
- 56, 37, 31, 93, 212, 203, 252, 150, 245, 69, 59, 19, 13, 137, 10, 28,
219, 174, 50, 32, 154, 80, 238,
- 64, 120, 54, 253, 18, 73, 50, 246, 158, 125, 73, 220, 173, 79, 20,
242, 68, 64, 102, 208, 107, 196,
- 48, 183, 50, 59, 161, 34, 246, 34, 145, 157, 225, 139, 31, 218, 176,
202, 153, 2, 185, 114, 157, 73,
- 44, 128, 126, 197, 153, 213, 233, 128, 178, 234, 201, 204, 83, 191,
103, 214, 191, 20, 214, 126, 45,
- 220, 142, 102, 131, 239, 87, 73, 97, 255, 105, 143, 97, 205, 209, 30,
157, 156, 22, 114, 114, 230,
- 29, 240, 132, 79, 74, 119, 2, 215, 232, 57, 44, 83, 203, 201, 18, 30,
51, 116, 158, 12, 244, 213,
- 212, 159, 212, 164, 89, 126, 53, 207, 50, 34, 244, 204, 207, 211, 144,
45, 72, 211, 143, 117, 230,
- 217, 29, 42, 229, 192, 247, 43, 120, 129, 135, 68, 14, 95, 80, 0, 212,
97, 141, 190, 123, 5, 21, 7,
- 59, 51, 130, 31, 24, 112, 146, 218, 100, 84, 206, 177, 133, 62, 105,
21, 248, 70, 106, 4, 150, 115,
- 14, 217, 22, 47, 103, 104, 212, 247, 74, 74, 208, 87, 104}, 255}, /*
pseudo-random data */
- {0x08, 0x7f, 0x86, 0xac, 0xe2, 0x2e, 0x28, 0x56, 0x74, 0x53, 0x4f, 0xc0,
0xfb, 0xb8, 0x79, 0x57,
- 0xc5, 0xc8, 0xd1, 0xb7, 0x47, 0xb7, 0xd9, 0xea, 0x97, 0xa8, 0x67, 0xe9,
0x26, 0x93, 0xee, 0xa3}
- }
+ {0x87, 0xa2, 0xfa, 0x2e, 0xec, 0x53, 0x05, 0x3c, 0xb1, 0xee, 0x07, 0xd7,
+ 0x59, 0x70, 0xf6, 0x50,
+ 0xcd, 0x9d, 0xc5, 0x8b, 0xdc, 0xb8, 0x65, 0x30, 0x4f, 0x70, 0x82, 0x9e,
+ 0xbd, 0xe2, 0x7d, 0xac}},
+ { { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20,
+ 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220,
+ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 240,
+ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255}, 256},
/* 0..255 sequence */
+ {0x40, 0xaf, 0xf2, 0xe9, 0xd2, 0xd8, 0x92, 0x2e, 0x47, 0xaf, 0xd4, 0x64,
+ 0x8e, 0x69, 0x67, 0x49,
+ 0x71, 0x58, 0x78, 0x5f, 0xbd, 0x1d, 0xa8, 0x70, 0xe7, 0x11, 0x02, 0x66,
+ 0xbf, 0x94, 0x48, 0x80}},
+ { { {199, 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, 186,
+ 185, 184, 183, 182, 181, 180,
+ 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166,
+ 165, 164, 163, 162, 161, 160,
+ 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146,
+ 145, 144, 143, 142, 141, 140,
+ 139}, 61}, /* 199..139 sequence */
+ {0x85, 0xf8, 0xa2, 0x83, 0xd6, 0x3c, 0x76, 0x8e, 0xea, 0x8f, 0x1c, 0x57,
+ 0x2d, 0x85, 0xb6, 0xff,
+ 0xd8, 0x33, 0x57, 0x62, 0x1d, 0x37, 0xae, 0x0e, 0xfc, 0x22, 0xd3, 0xd5,
+ 0x8f, 0x53, 0x21, 0xb7}},
+ { { {255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242,
+ 241, 240, 239, 238, 237, 236,
+ 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, 222,
+ 221, 220, 219, 218, 217, 216,
+ 215, 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, 202,
+ 201, 200, 199, 198, 197, 196,
+ 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182,
+ 181, 180, 179, 178, 177, 176,
+ 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162,
+ 161, 160, 159, 158, 157, 156,
+ 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, 143, 142,
+ 141, 140, 139, 138, 137, 136,
+ 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122,
+ 121, 120, 119, 118, 117, 116,
+ 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102,
+ 101, 100, 99, 98, 97, 96, 95,
+ 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77,
+ 76, 75, 74, 73, 72, 71, 70,
+ 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52,
+ 51, 50, 49, 48, 47, 46, 45,
+ 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27,
+ 26, 25, 24, 23, 22, 21, 20,
+ 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1},
255}, /* 255..1 sequence */
+ {0x61, 0x86, 0x96, 0xab, 0x3e, 0xaa, 0x0e, 0x64, 0xb2, 0xf7, 0x2d, 0x75,
+ 0x47, 0x5a, 0x14, 0x97,
+ 0xa3, 0x3d, 0x59, 0xa4, 0x08, 0xd9, 0x9e, 0x73, 0xf2, 0x78, 0x00, 0x5b,
+ 0x4b, 0x55, 0xca, 0x43}},
+ { { {41, 35, 190, 132, 225, 108, 214, 174, 82, 144, 73, 241, 241, 187, 233,
+ 235, 179, 166, 219, 60, 135,
+ 12, 62, 153, 36, 94, 13, 28, 6, 183, 71, 222, 179, 18, 77, 200, 67, 187,
+ 139, 166, 31, 3, 90, 125, 9,
+ 56, 37, 31, 93, 212, 203, 252, 150, 245, 69, 59, 19, 13, 137, 10, 28,
+ 219, 174, 50, 32, 154, 80, 238,
+ 64, 120, 54, 253, 18, 73, 50, 246, 158, 125, 73, 220, 173, 79, 20, 242,
+ 68, 64, 102, 208, 107, 196,
+ 48, 183, 50, 59, 161, 34, 246, 34, 145, 157, 225, 139, 31, 218, 176,
202,
+ 153, 2, 185, 114, 157, 73,
+ 44, 128, 126, 197, 153, 213, 233, 128, 178, 234, 201, 204, 83, 191, 103,
+ 214, 191, 20, 214, 126, 45,
+ 220, 142, 102, 131, 239, 87, 73, 97, 255, 105, 143, 97, 205, 209, 30,
+ 157, 156, 22, 114, 114, 230,
+ 29, 240, 132, 79, 74, 119, 2, 215, 232, 57, 44, 83, 203, 201, 18, 30,
51,
+ 116, 158, 12, 244, 213,
+ 212, 159, 212, 164, 89, 126, 53, 207, 50, 34, 244, 204, 207, 211, 144,
+ 45, 72, 211, 143, 117, 230,
+ 217, 29, 42, 229, 192, 247, 43, 120, 129, 135, 68, 14, 95, 80, 0, 212,
+ 97, 141, 190, 123, 5, 21, 7,
+ 59, 51, 130, 31, 24, 112, 146, 218, 100, 84, 206, 177, 133, 62, 105, 21,
+ 248, 70, 106, 4, 150, 115,
+ 14, 217, 22, 47, 103, 104, 212, 247, 74, 74, 208, 87, 104}, 255}, /*
pseudo-random data */
+ {0x08, 0x7f, 0x86, 0xac, 0xe2, 0x2e, 0x28, 0x56, 0x74, 0x53, 0x4f, 0xc0,
+ 0xfb, 0xb8, 0x79, 0x57,
+ 0xc5, 0xc8, 0xd1, 0xb7, 0x47, 0xb7, 0xd9, 0xea, 0x97, 0xa8, 0x67, 0xe9,
+ 0x26, 0x93, 0xee, 0xa3}}
};
static const size_t units2_num = sizeof(data_units2) / sizeof(data_units2[0]);
@@ -196,17 +271,17 @@ static const size_t units2_num = sizeof(data_units2) /
sizeof(data_units2[0]);
*/
static void
bin2hex (const uint8_t *bin,
- size_t len,
- char *hex)
+ size_t len,
+ char *hex)
{
while (len-- > 0)
- {
- unsigned int b1, b2;
- b1 = (*bin >> 4) & 0xf;
- *hex++ = (char)((b1 > 9) ? (b1 + 'A' - 10) : (b1 + '0'));
- b2 = *bin++ & 0xf;
- *hex++ = (char)((b2 > 9) ? (b2 + 'A' - 10) : (b2 + '0'));
- }
+ {
+ unsigned int b1, b2;
+ b1 = (*bin >> 4) & 0xf;
+ *hex++ = (char) ((b1 > 9) ? (b1 + 'A' - 10) : (b1 + '0'));
+ b2 = *bin++ & 0xf;
+ *hex++ = (char) ((b2 > 9) ? (b2 + 'A' - 10) : (b2 + '0'));
+ }
*hex = 0;
}
@@ -216,26 +291,28 @@ check_result (const char *test_name,
const uint8_t calcualted[SHA256_DIGEST_SIZE],
const uint8_t expected[SHA256_DIGEST_SIZE])
{
- int failed = memcmp(calcualted, expected, SHA256_DIGEST_SIZE);
+ int failed = memcmp (calcualted, expected, SHA256_DIGEST_SIZE);
check_num++; /* Print 1-based numbers */
if (failed)
- {
- char calc_str[SHA256_DIGEST_STRING_SIZE];
- char expc_str[SHA256_DIGEST_STRING_SIZE];
- bin2hex(calcualted, SHA256_DIGEST_SIZE, calc_str);
- bin2hex(expected, SHA256_DIGEST_SIZE, expc_str);
- fprintf (stderr, "FAILED: %s check %u: calculated digest %s, expected
digest %s.\n",
- test_name, check_num, calc_str, expc_str);
- fflush (stderr);
- }
+ {
+ char calc_str[SHA256_DIGEST_STRING_SIZE];
+ char expc_str[SHA256_DIGEST_STRING_SIZE];
+ bin2hex (calcualted, SHA256_DIGEST_SIZE, calc_str);
+ bin2hex (expected, SHA256_DIGEST_SIZE, expc_str);
+ fprintf (stderr,
+ "FAILED: %s check %u: calculated digest %s, expected digest
%s.\n",
+ test_name, check_num, calc_str, expc_str);
+ fflush (stderr);
+ }
else if (verbose)
- {
- char calc_str[SHA256_DIGEST_STRING_SIZE];
- bin2hex(calcualted, SHA256_DIGEST_SIZE, calc_str);
- printf ("PASSED: %s check %u: calculated digest %s match expected
digest.\n",
- test_name, check_num, calc_str);
- fflush (stdout);
- }
+ {
+ char calc_str[SHA256_DIGEST_STRING_SIZE];
+ bin2hex (calcualted, SHA256_DIGEST_SIZE, calc_str);
+ printf (
+ "PASSED: %s check %u: calculated digest %s match expected digest.\n",
+ test_name, check_num, calc_str);
+ fflush (stdout);
+ }
return failed ? 1 : 0;
}
@@ -245,91 +322,111 @@ check_result (const char *test_name,
*/
/* Calculated SHA-256 as one pass for whole data */
-int test1_str(void)
+static int
+test1_str (void)
{
int num_failed = 0;
- for (unsigned int i = 0; i < units1_num; i++)
- {
- struct sha256_ctx ctx;
- uint8_t digest[SHA256_DIGEST_SIZE];
-
- MHD_SHA256_init (&ctx);
- MHD_SHA256_update (&ctx, (const uint8_t*)data_units1[i].str_l.str,
data_units1[i].str_l.len);
- sha256_finish (&ctx, digest);
- num_failed += check_result (__FUNCTION__, i, digest,
- data_units1[i].digest);
- }
+ unsigned int i;
+
+ for (i = 0; i < units1_num; i++)
+ {
+ struct sha256_ctx ctx;
+ uint8_t digest[SHA256_DIGEST_SIZE];
+
+ MHD_SHA256_init (&ctx);
+ MHD_SHA256_update (&ctx, (const uint8_t*) data_units1[i].str_l.str,
+ data_units1[i].str_l.len);
+ sha256_finish (&ctx, digest);
+ num_failed += check_result (__FUNCTION__, i, digest,
+ data_units1[i].digest);
+ }
return num_failed;
}
-int test1_bin(void)
+
+static int
+test1_bin (void)
{
int num_failed = 0;
- for (unsigned int i = 0; i < units2_num; i++)
- {
- struct sha256_ctx ctx;
- uint8_t digest[SHA256_DIGEST_SIZE];
-
- MHD_SHA256_init (&ctx);
- MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin,
data_units2[i].bin_l.len);
- sha256_finish (&ctx, digest);
- num_failed += check_result (__FUNCTION__, i, digest,
- data_units2[i].digest);
- }
+ unsigned int i;
+
+ for (i = 0; i < units2_num; i++)
+ {
+ struct sha256_ctx ctx;
+ uint8_t digest[SHA256_DIGEST_SIZE];
+
+ MHD_SHA256_init (&ctx);
+ MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin,
+ data_units2[i].bin_l.len);
+ sha256_finish (&ctx, digest);
+ num_failed += check_result (__FUNCTION__, i, digest,
+ data_units2[i].digest);
+ }
return num_failed;
}
/* Calculated SHA-256 as two iterations for whole data */
-int test2_str(void)
+static int
+test2_str (void)
{
int num_failed = 0;
- for (unsigned int i = 0; i < units1_num; i++)
- {
- struct sha256_ctx ctx;
- uint8_t digest[SHA256_DIGEST_SIZE];
- size_t part_s = data_units1[i].str_l.len / 4;
-
- MHD_SHA256_init (&ctx);
- MHD_SHA256_update (&ctx, (const uint8_t*)data_units1[i].str_l.str,
part_s);
- MHD_SHA256_update (&ctx, (const uint8_t*)data_units1[i].str_l.str +
part_s, data_units1[i].str_l.len - part_s);
- sha256_finish (&ctx, digest);
- num_failed += check_result (__FUNCTION__, i, digest,
- data_units1[i].digest);
- }
+ unsigned int i;
+
+ for (i = 0; i < units1_num; i++)
+ {
+ struct sha256_ctx ctx;
+ uint8_t digest[SHA256_DIGEST_SIZE];
+ size_t part_s = data_units1[i].str_l.len / 4;
+
+ MHD_SHA256_init (&ctx);
+ MHD_SHA256_update (&ctx, (const uint8_t*) data_units1[i].str_l.str,
part_s);
+ MHD_SHA256_update (&ctx, (const uint8_t*) data_units1[i].str_l.str +
part_s,
+ data_units1[i].str_l.len - part_s);
+ sha256_finish (&ctx, digest);
+ num_failed += check_result (__FUNCTION__, i, digest,
+ data_units1[i].digest);
+ }
return num_failed;
}
-int test2_bin(void)
+
+static int
+test2_bin (void)
{
int num_failed = 0;
- for (unsigned int i = 0; i < units2_num; i++)
- {
- struct sha256_ctx ctx;
- uint8_t digest[SHA256_DIGEST_SIZE];
- size_t part_s = data_units2[i].bin_l.len * 2 / 3;
-
- MHD_SHA256_init (&ctx);
- MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin, part_s);
- MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin + part_s,
data_units2[i].bin_l.len - part_s);
- sha256_finish (&ctx, digest);
- num_failed += check_result (__FUNCTION__, i, digest,
- data_units2[i].digest);
- }
+ unsigned int i;
+
+ for (i = 0; i < units2_num; i++)
+ {
+ struct sha256_ctx ctx;
+ uint8_t digest[SHA256_DIGEST_SIZE];
+ size_t part_s = data_units2[i].bin_l.len * 2 / 3;
+
+ MHD_SHA256_init (&ctx);
+ MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin, part_s);
+ MHD_SHA256_update (&ctx, data_units2[i].bin_l.bin + part_s,
+ data_units2[i].bin_l.len - part_s);
+ sha256_finish (&ctx, digest);
+ num_failed += check_result (__FUNCTION__, i, digest,
+ data_units2[i].digest);
+ }
return num_failed;
}
-int main(int argc, char * argv[])
+
+int
+main (int argc, char *argv[])
{
int num_failed = 0;
- (void)has_in_name; /* Mute compiler warning. */
- if (has_param(argc, argv, "-v") || has_param(argc, argv, "--verbose"))
+ (void) has_in_name; /* Mute compiler warning. */
+ if (has_param (argc, argv, "-v") || has_param (argc, argv, "--verbose"))
verbose = 1;
- num_failed += test1_str();
- num_failed += test1_bin();
+ num_failed += test1_str ();
+ num_failed += test1_bin ();
- num_failed += test2_str();
- num_failed += test2_bin();
+ num_failed += test2_str ();
+ num_failed += test2_bin ();
return num_failed ? 1 : 0;
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: get rid of c99-isms,
gnunet <=