diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_crypto_hkdf.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/test_crypto_hkdf.c')
-rw-r--r-- | src/util/test_crypto_hkdf.c | 94 |
1 files changed, 48 insertions, 46 deletions
diff --git a/src/util/test_crypto_hkdf.c b/src/util/test_crypto_hkdf.c index 752116194..d5ee4d433 100644 --- a/src/util/test_crypto_hkdf.c +++ b/src/util/test_crypto_hkdf.c | |||
@@ -36,17 +36,17 @@ void | |||
36 | tc1 () | 36 | tc1 () |
37 | { | 37 | { |
38 | unsigned char ikm[22] = | 38 | unsigned char ikm[22] = |
39 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 39 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
40 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b | 40 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b |
41 | }; | 41 | }; |
42 | unsigned char salt[13] = | 42 | unsigned char salt[13] = |
43 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, | 43 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, |
44 | 0x0a, 0x0b, 0x0c | 44 | 0x0a, 0x0b, 0x0c |
45 | }; | 45 | }; |
46 | unsigned char info[10] = | 46 | unsigned char info[10] = |
47 | { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9 }; | 47 | { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9 }; |
48 | unsigned char okm[42] = | 48 | unsigned char okm[42] = |
49 | { 0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a, 0x90, 0x43, | 49 | { 0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a, 0x90, 0x43, |
50 | 0x4f, 0x64, 0xd0, 0x36, 0x2f, 0x2a, 0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, | 50 | 0x4f, 0x64, 0xd0, 0x36, 0x2f, 0x2a, 0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, |
51 | 0x5a, 0x4c, 0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf, 0x34, 0x00, | 51 | 0x5a, 0x4c, 0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf, 0x34, 0x00, |
52 | 0x72, 0x08, 0xd5, 0xb8, 0x87, 0x18, 0x58, 0x65 | 52 | 0x72, 0x08, 0xd5, 0xb8, 0x87, 0x18, 0x58, 0x65 |
@@ -56,9 +56,9 @@ tc1 () | |||
56 | 56 | ||
57 | memset (result, 0, sizeof (result)); | 57 | memset (result, 0, sizeof (result)); |
58 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 58 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
59 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, salt, | 59 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, salt, |
60 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), | 60 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), |
61 | NULL) == GNUNET_YES); | 61 | NULL) == GNUNET_YES); |
62 | GNUNET_assert (memcmp (result, okm, l) == 0); | 62 | GNUNET_assert (memcmp (result, okm, l) == 0); |
63 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 63 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
64 | } | 64 | } |
@@ -67,7 +67,7 @@ void | |||
67 | tc2 () | 67 | tc2 () |
68 | { | 68 | { |
69 | unsigned char ikm[80] = | 69 | unsigned char ikm[80] = |
70 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, | 70 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, |
71 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, | 71 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, |
72 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, | 72 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, |
73 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | 73 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, |
@@ -76,7 +76,7 @@ tc2 () | |||
76 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f | 76 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f |
77 | }; | 77 | }; |
78 | unsigned char salt[80] = | 78 | unsigned char salt[80] = |
79 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | 79 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, |
80 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, | 80 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, |
81 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, | 81 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, |
82 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, | 82 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, |
@@ -85,7 +85,7 @@ tc2 () | |||
85 | 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf | 85 | 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf |
86 | }; | 86 | }; |
87 | unsigned char info[80] = | 87 | unsigned char info[80] = |
88 | { 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, | 88 | { 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, |
89 | 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, | 89 | 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, |
90 | 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, | 90 | 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, |
91 | 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, | 91 | 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, |
@@ -94,7 +94,7 @@ tc2 () | |||
94 | 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff | 94 | 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff |
95 | }; | 95 | }; |
96 | unsigned char okm[82] = | 96 | unsigned char okm[82] = |
97 | { 0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1, 0xc8, 0xe7, | 97 | { 0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1, 0xc8, 0xe7, |
98 | 0xf7, 0x8c, 0x59, 0x6a, 0x49, 0x34, 0x4f, 0x01, 0x2e, 0xda, 0x2d, 0x4e, | 98 | 0xf7, 0x8c, 0x59, 0x6a, 0x49, 0x34, 0x4f, 0x01, 0x2e, 0xda, 0x2d, 0x4e, |
99 | 0xfa, 0xd8, 0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c, 0x59, 0x04, | 99 | 0xfa, 0xd8, 0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c, 0x59, 0x04, |
100 | 0x5a, 0x99, 0xca, 0xc7, 0x82, 0x72, 0x71, 0xcb, 0x41, 0xc6, 0x5e, 0x59, | 100 | 0x5a, 0x99, 0xca, 0xc7, 0x82, 0x72, 0x71, 0xcb, 0x41, 0xc6, 0x5e, 0x59, |
@@ -107,9 +107,9 @@ tc2 () | |||
107 | 107 | ||
108 | memset (result, 0, sizeof (result)); | 108 | memset (result, 0, sizeof (result)); |
109 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 109 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
110 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, salt, | 110 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, salt, |
111 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), | 111 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), |
112 | NULL) == GNUNET_YES); | 112 | NULL) == GNUNET_YES); |
113 | GNUNET_assert (memcmp (result, okm, l) == 0); | 113 | GNUNET_assert (memcmp (result, okm, l) == 0); |
114 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 114 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
115 | } | 115 | } |
@@ -118,11 +118,11 @@ void | |||
118 | tc3 () | 118 | tc3 () |
119 | { | 119 | { |
120 | unsigned char ikm[22] = | 120 | unsigned char ikm[22] = |
121 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 121 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
122 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b | 122 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b |
123 | }; | 123 | }; |
124 | unsigned char okm[42] = | 124 | unsigned char okm[42] = |
125 | { 0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f, 0x71, 0x5f, | 125 | { 0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f, 0x71, 0x5f, |
126 | 0x80, 0x2a, 0x06, 0x3c, 0x5a, 0x31, 0xb8, 0xa1, 0x1f, 0x5c, 0x5e, 0xe1, | 126 | 0x80, 0x2a, 0x06, 0x3c, 0x5a, 0x31, 0xb8, 0xa1, 0x1f, 0x5c, 0x5e, 0xe1, |
127 | 0x87, 0x9e, 0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d, 0x9d, 0x20, | 127 | 0x87, 0x9e, 0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d, 0x9d, 0x20, |
128 | 0x13, 0x95, 0xfa, 0xa4, 0xb6, 0x1a, 0x96, 0xc8 | 128 | 0x13, 0x95, 0xfa, 0xa4, 0xb6, 0x1a, 0x96, 0xc8 |
@@ -132,8 +132,8 @@ tc3 () | |||
132 | 132 | ||
133 | memset (result, 0, sizeof (result)); | 133 | memset (result, 0, sizeof (result)); |
134 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 134 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
135 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, NULL, 0, ikm, | 135 | (result, l, GCRY_MD_SHA256, GCRY_MD_SHA256, NULL, 0, ikm, |
136 | sizeof (ikm), NULL, 0, NULL) == GNUNET_YES); | 136 | sizeof (ikm), NULL, 0, NULL) == GNUNET_YES); |
137 | GNUNET_assert (memcmp (result, okm, l) == 0); | 137 | GNUNET_assert (memcmp (result, okm, l) == 0); |
138 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 138 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
139 | } | 139 | } |
@@ -142,17 +142,17 @@ void | |||
142 | tc4 () | 142 | tc4 () |
143 | { | 143 | { |
144 | unsigned char ikm[11] = | 144 | unsigned char ikm[11] = |
145 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 145 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
146 | 0x0b | 146 | 0x0b |
147 | }; | 147 | }; |
148 | unsigned char salt[13] = | 148 | unsigned char salt[13] = |
149 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, | 149 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, |
150 | 0x0a, 0x0b, 0x0c | 150 | 0x0a, 0x0b, 0x0c |
151 | }; | 151 | }; |
152 | unsigned char info[10] = | 152 | unsigned char info[10] = |
153 | { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9 }; | 153 | { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9 }; |
154 | unsigned char okm[42] = | 154 | unsigned char okm[42] = |
155 | { 0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69, 0x33, 0x06, | 155 | { 0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69, 0x33, 0x06, |
156 | 0x8b, 0x56, 0xef, 0xa5, 0xad, 0x81, 0xa4, 0xf1, 0x4b, 0x82, 0x2f, 0x5b, | 156 | 0x8b, 0x56, 0xef, 0xa5, 0xad, 0x81, 0xa4, 0xf1, 0x4b, 0x82, 0x2f, 0x5b, |
157 | 0x09, 0x15, 0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2, 0xc2, 0x2e, | 157 | 0x09, 0x15, 0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2, 0xc2, 0x2e, |
158 | 0x42, 0x24, 0x78, 0xd3, 0x05, 0xf3, 0xf8, 0x96 | 158 | 0x42, 0x24, 0x78, 0xd3, 0x05, 0xf3, 0xf8, 0x96 |
@@ -162,8 +162,9 @@ tc4 () | |||
162 | 162 | ||
163 | memset (result, 0, sizeof (result)); | 163 | memset (result, 0, sizeof (result)); |
164 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 164 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
165 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), | 165 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), |
166 | ikm, sizeof (ikm), info, sizeof (info), NULL) == GNUNET_YES); | 166 | ikm, sizeof (ikm), info, sizeof (info), |
167 | NULL) == GNUNET_YES); | ||
167 | GNUNET_assert (memcmp (result, okm, l) == 0); | 168 | GNUNET_assert (memcmp (result, okm, l) == 0); |
168 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 169 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
169 | } | 170 | } |
@@ -172,7 +173,7 @@ void | |||
172 | tc5 () | 173 | tc5 () |
173 | { | 174 | { |
174 | unsigned char ikm[80] = | 175 | unsigned char ikm[80] = |
175 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, | 176 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, |
176 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, | 177 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, |
177 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, | 178 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, |
178 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | 179 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, |
@@ -181,7 +182,7 @@ tc5 () | |||
181 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f | 182 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f |
182 | }; | 183 | }; |
183 | unsigned char salt[80] = | 184 | unsigned char salt[80] = |
184 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | 185 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, |
185 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, | 186 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, |
186 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, | 187 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, |
187 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, | 188 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, |
@@ -190,7 +191,7 @@ tc5 () | |||
190 | 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf | 191 | 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf |
191 | }; | 192 | }; |
192 | unsigned char info[80] = | 193 | unsigned char info[80] = |
193 | { 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, | 194 | { 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, |
194 | 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, | 195 | 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, |
195 | 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, | 196 | 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, |
196 | 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, | 197 | 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, |
@@ -199,7 +200,7 @@ tc5 () | |||
199 | 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff | 200 | 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff |
200 | }; | 201 | }; |
201 | unsigned char okm[82] = | 202 | unsigned char okm[82] = |
202 | { 0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, | 203 | { 0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, |
203 | 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, | 204 | 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, |
204 | 0x92, 0x19, 0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f, 0xa3, | 205 | 0x92, 0x19, 0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f, 0xa3, |
205 | 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, | 206 | 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, |
@@ -212,8 +213,9 @@ tc5 () | |||
212 | 213 | ||
213 | memset (result, 0, sizeof (result)); | 214 | memset (result, 0, sizeof (result)); |
214 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 215 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
215 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), | 216 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), |
216 | ikm, sizeof (ikm), info, sizeof (info), NULL) == GNUNET_YES); | 217 | ikm, sizeof (ikm), info, sizeof (info), |
218 | NULL) == GNUNET_YES); | ||
217 | GNUNET_assert (memcmp (result, okm, l) == 0); | 219 | GNUNET_assert (memcmp (result, okm, l) == 0); |
218 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 220 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
219 | } | 221 | } |
@@ -222,11 +224,11 @@ void | |||
222 | tc6 () | 224 | tc6 () |
223 | { | 225 | { |
224 | unsigned char ikm[22] = | 226 | unsigned char ikm[22] = |
225 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 227 | { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
226 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b | 228 | 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b |
227 | }; | 229 | }; |
228 | unsigned char okm[42] = | 230 | unsigned char okm[42] = |
229 | { 0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61, 0xd1, 0xe5, | 231 | { 0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61, 0xd1, 0xe5, |
230 | 0x52, 0x98, 0xda, 0x9d, 0x05, 0x06, 0xb9, 0xae, 0x52, 0x05, 0x72, 0x20, | 232 | 0x52, 0x98, 0xda, 0x9d, 0x05, 0x06, 0xb9, 0xae, 0x52, 0x05, 0x72, 0x20, |
231 | 0xa3, 0x06, 0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0, 0xea, 0x00, | 233 | 0xa3, 0x06, 0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0, 0xea, 0x00, |
232 | 0x03, 0x3d, 0xe0, 0x39, 0x84, 0xd3, 0x49, 0x18 | 234 | 0x03, 0x3d, 0xe0, 0x39, 0x84, 0xd3, 0x49, 0x18 |
@@ -236,8 +238,8 @@ tc6 () | |||
236 | 238 | ||
237 | memset (result, 0, sizeof (result)); | 239 | memset (result, 0, sizeof (result)); |
238 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 240 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
239 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, NULL, 0, ikm, | 241 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, NULL, 0, ikm, |
240 | sizeof (ikm), NULL, 0, NULL) == GNUNET_YES); | 242 | sizeof (ikm), NULL, 0, NULL) == GNUNET_YES); |
241 | GNUNET_assert (memcmp (result, okm, l) == 0); | 243 | GNUNET_assert (memcmp (result, okm, l) == 0); |
242 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 244 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
243 | } | 245 | } |
@@ -246,7 +248,7 @@ void | |||
246 | tc7 () | 248 | tc7 () |
247 | { | 249 | { |
248 | unsigned char ikm[80] = | 250 | unsigned char ikm[80] = |
249 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, | 251 | { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, |
250 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, | 252 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, |
251 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, | 253 | 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, |
252 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | 254 | 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, |
@@ -255,7 +257,7 @@ tc7 () | |||
255 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f | 257 | 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f |
256 | }; | 258 | }; |
257 | unsigned char salt[80] = | 259 | unsigned char salt[80] = |
258 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | 260 | { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, |
259 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, | 261 | 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, |
260 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, | 262 | 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, |
261 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, | 263 | 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, |
@@ -275,7 +277,7 @@ tc7 () | |||
275 | 0xfe, 0xff | 277 | 0xfe, 0xff |
276 | }; | 278 | }; |
277 | unsigned char okm[82] = | 279 | unsigned char okm[82] = |
278 | { 0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, | 280 | { 0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, |
279 | 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, | 281 | 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, |
280 | 0x92, 0x19, 0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f, 0xa3, | 282 | 0x92, 0x19, 0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f, 0xa3, |
281 | 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, | 283 | 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, |
@@ -288,9 +290,9 @@ tc7 () | |||
288 | 290 | ||
289 | memset (result, 0, sizeof (result)); | 291 | memset (result, 0, sizeof (result)); |
290 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 292 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
291 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), | 293 | (result, l, GCRY_MD_SHA1, GCRY_MD_SHA1, salt, sizeof (salt), |
292 | ikm, sizeof (ikm), info1, sizeof (info1), info2, | 294 | ikm, sizeof (ikm), info1, sizeof (info1), info2, |
293 | sizeof (info2), NULL) == GNUNET_YES); | 295 | sizeof (info2), NULL) == GNUNET_YES); |
294 | GNUNET_assert (memcmp (result, okm, l) == 0); | 296 | GNUNET_assert (memcmp (result, okm, l) == 0); |
295 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 297 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
296 | } | 298 | } |
@@ -299,13 +301,13 @@ void | |||
299 | tc8 () | 301 | tc8 () |
300 | { | 302 | { |
301 | unsigned char ikm[32] = | 303 | unsigned char ikm[32] = |
302 | { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72, | 304 | { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72, |
303 | 0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe, | 305 | 0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe, |
304 | 0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde | 306 | 0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde |
305 | }; | 307 | }; |
306 | unsigned char salt[4] = { 0xfc, 0x62, 0x76, 0x35 }; | 308 | unsigned char salt[4] = { 0xfc, 0x62, 0x76, 0x35 }; |
307 | unsigned char info[86] = | 309 | unsigned char info[86] = |
308 | { 0x8c, 0x0d, 0xcf, 0xb3, 0x25, 0x6e, 0x88, 0x0d, 0xc1, 0x0b, | 310 | { 0x8c, 0x0d, 0xcf, 0xb3, 0x25, 0x6e, 0x88, 0x0d, 0xc1, 0x0b, |
309 | 0x1d, 0x33, 0x15, 0x3e, 0x52, 0x0b, 0xb0, 0x77, 0xff, 0x7d, 0xc3, 0xc7, | 311 | 0x1d, 0x33, 0x15, 0x3e, 0x52, 0x0b, 0xb0, 0x77, 0xff, 0x7d, 0xc3, 0xc7, |
310 | 0xef, 0xe5, 0x8e, 0x3c, 0xc4, 0x4e, 0x8b, 0x41, 0x46, 0x1f, 0x02, 0x94, | 312 | 0xef, 0xe5, 0x8e, 0x3c, 0xc4, 0x4e, 0x8b, 0x41, 0x46, 0x1f, 0x02, 0x94, |
311 | 0x82, 0x35, 0xc5, 0xa6, 0x5e, 0x91, 0xd8, 0xa2, 0x90, 0xfd, 0x6f, 0xb4, | 313 | 0x82, 0x35, 0xc5, 0xa6, 0x5e, 0x91, 0xd8, 0xa2, 0x90, 0xfd, 0x6f, 0xb4, |
@@ -315,7 +317,7 @@ tc8 () | |||
315 | 0x74, 0x6f, 0x72, 0x00 | 317 | 0x74, 0x6f, 0x72, 0x00 |
316 | }; | 318 | }; |
317 | unsigned char okm[16] = | 319 | unsigned char okm[16] = |
318 | { 0xd6, 0x90, 0xec, 0x9e, 0x62, 0xdf, 0xb9, 0x41, 0xff, 0x92, | 320 | { 0xd6, 0x90, 0xec, 0x9e, 0x62, 0xdf, 0xb9, 0x41, 0xff, 0x92, |
319 | 0x4f, 0xd2, 0xf6, 0x1d, 0x67, 0xe0 | 321 | 0x4f, 0xd2, 0xf6, 0x1d, 0x67, 0xe0 |
320 | }; | 322 | }; |
321 | char result[18]; | 323 | char result[18]; |
@@ -323,9 +325,9 @@ tc8 () | |||
323 | 325 | ||
324 | memset (result, 0, sizeof (result)); | 326 | memset (result, 0, sizeof (result)); |
325 | GNUNET_assert (GNUNET_CRYPTO_hkdf | 327 | GNUNET_assert (GNUNET_CRYPTO_hkdf |
326 | (result, l, GCRY_MD_SHA512, GCRY_MD_SHA256, salt, | 328 | (result, l, GCRY_MD_SHA512, GCRY_MD_SHA256, salt, |
327 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), | 329 | sizeof (salt), ikm, sizeof (ikm), info, sizeof (info), |
328 | NULL) == GNUNET_YES); | 330 | NULL) == GNUNET_YES); |
329 | GNUNET_assert (memcmp (result, okm, l) == 0); | 331 | GNUNET_assert (memcmp (result, okm, l) == 0); |
330 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); | 332 | GNUNET_assert (memcmp (result + l, "\0", 2) == 0); |
331 | } | 333 | } |