LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
7013 Commits
1 Branch
46 MiB
Tree: fe80861f7c
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'fe80861f7c'
${ noResults }
openwrt-packages-dist/net/knot/patches/04_cookies_big_endian.patch

217 lines
10 KiB
Raw Normal View History

knot: update to 2.3.0 Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
8 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001
  2. From: Karel Slany <karel.slany@nic.cz>
  3. Date: Thu, 11 Aug 2016 11:39:39 +0200
  4. Subject: [PATCH] Added conversion to wire format when writing FNV64 hash
  5.  values.
  6. 

  7. Test on big-endian machines have been failing.
  8. ---

  9.  src/libknot/cookies/alg-fnv64.c     |  6 +++---
  10.  tests/libknot/test_cookies-client.c | 20 ++++++++++----------
  11.  tests/libknot/test_cookies-server.c | 20 ++++++++++----------
  12.  3 files changed, 23 insertions(+), 23 deletions(-)
  13. 

  14. diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c

  15. index 9989a4f..5e263c1 100644

  16. --- a/src/libknot/cookies/alg-fnv64.c

  17. +++ b/src/libknot/cookies/alg-fnv64.c

  18. @@ -17,10 +17,10 @@

  19.  #include <assert.h>
  20.  #include <stdint.h>
  21.  #include <stdlib.h>
  22. -#include <string.h>

  23.  
  24.  #include "contrib/fnv/fnv.h"
  25.  #include "contrib/sockaddr.h"
  26. +#include "contrib/wire.h"

  27.  #include "libknot/attribute.h"
  28.  #include "libknot/cookies/alg-fnv64.h"
  29.  #include "libknot/rrtype/opt-cookie.h"
  30. @@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input,

  31.  	assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val));
  32.  
  33.  	cc_len = sizeof(hash_val);
  34. -	memcpy(cc_out, &hash_val, cc_len);

  35. +	wire_write_u64(cc_out, hash_val);

  36.  
  37.  	return cc_len;
  38.  }
  39. @@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input,

  40.  	assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val));
  41.  
  42.  	hash_len = sizeof(hash_val);
  43. -	memcpy(hash_out, &hash_val, hash_len);

  44. +	wire_write_u64(hash_out, hash_val);

  45.  
  46.  	return hash_len;
  47.  }
  48. diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c

  49. index 44be903..712dbba 100644

  50. --- a/tests/libknot/test_cookies-client.c

  51. +++ b/tests/libknot/test_cookies-client.c

  52. @@ -110,7 +110,7 @@ int main(int argc, char *argv[])

  53.  	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
  54.  	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
  55.  	{
  56. -		uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 };

  57. +		uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 };

  58.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
  59.  	}
  60.  
  61. @@ -123,7 +123,7 @@ int main(int argc, char *argv[])

  62.  	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
  63.  	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
  64.  	{
  65. -		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };

  66. +		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };

  67.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
  68.  	}
  69.  
  70. @@ -136,7 +136,7 @@ int main(int argc, char *argv[])

  71.  	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
  72.  	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
  73.  	{
  74. -		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };

  75. +		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };

  76.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
  77.  	}
  78.  
  79. @@ -149,7 +149,7 @@ int main(int argc, char *argv[])

  80.  	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
  81.  	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
  82.  	{
  83. -		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };

  84. +		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };

  85.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
  86.  	}
  87.  
  88. @@ -162,7 +162,7 @@ int main(int argc, char *argv[])

  89.  	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
  90.  	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
  91.  	{
  92. -		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };

  93. +		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };

  94.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
  95.  	}
  96.  
  97. @@ -179,7 +179,7 @@ int main(int argc, char *argv[])

  98.  	}
  99.  
  100.  	{
  101. -		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };

  102. +		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };

  103.  		ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64);
  104.  		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input");
  105.  	}
  106. @@ -190,7 +190,7 @@ int main(int argc, char *argv[])

  107.  	cc_in.secret_data = secret;
  108.  	cc_in.secret_len = sizeof(secret);
  109.  	{
  110. -		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };

  111. +		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };

  112.  		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL);
  113.  		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm");
  114.  	}
  115. @@ -201,7 +201,7 @@ int main(int argc, char *argv[])

  116.  	cc_in.secret_data = secret;
  117.  	cc_in.secret_len = sizeof(secret);
  118.  	{
  119. -		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };

  120. +		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };

  121.  		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
  122.  		ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check");
  123.  	}
  124. @@ -212,7 +212,7 @@ int main(int argc, char *argv[])

  125.  	cc_in.secret_data = secret;
  126.  	cc_in.secret_len = sizeof(secret);
  127.  	{
  128. -		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };

  129. +		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };

  130.  		ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64);
  131.  		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length");
  132.  	}
  133. @@ -223,7 +223,7 @@ int main(int argc, char *argv[])

  134.  	cc_in.secret_data = secret;
  135.  	cc_in.secret_len = sizeof(secret);
  136.  	{
  137. -		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae };

  138. +		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 };

  139.  		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
  140.  		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie");
  141.  	}
  142. diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c

  143. index 32001c1..66a54ba 100644

  144. --- a/tests/libknot/test_cookies-server.c

  145. +++ b/tests/libknot/test_cookies-server.c

  146. @@ -28,10 +28,10 @@

  147.  #include "libknot/rrtype/opt-cookie.h"
  148.  
  149.  const char *cookie_opts[] = {
  150. -	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */

  151. -	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */

  152. -	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */

  153. -	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */

  154. +	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */

  155. +	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */

  156. +	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */

  157. +	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */

  158.  };
  159.  
  160.  #define ROPT(i) ((const uint8_t *)cookie_opts[(i)])
  161. @@ -193,7 +193,7 @@ int main(int argc, char *argv[])

  162.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  163.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  164.  	{
  165. -		uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea };

  166. +		uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 };

  167.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  168.  	}
  169.  
  170. @@ -210,7 +210,7 @@ int main(int argc, char *argv[])

  171.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  172.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  173.  	{
  174. -		uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 };

  175. +		uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 };

  176.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  177.  	}
  178.  
  179. @@ -227,7 +227,7 @@ int main(int argc, char *argv[])

  180.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  181.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  182.  	{
  183. -		uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 };

  184. +		uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 };

  185.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  186.  	}
  187.  
  188. @@ -244,7 +244,7 @@ int main(int argc, char *argv[])

  189.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  190.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  191.  	{
  192. -		uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 };

  193. +		uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d };

  194.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  195.  	}
  196.  
  197. @@ -261,7 +261,7 @@ int main(int argc, char *argv[])

  198.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  199.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  200.  	{
  201. -		uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf };

  202. +		uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 };

  203.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  204.  	}
  205.  
  206. @@ -278,7 +278,7 @@ int main(int argc, char *argv[])

  207.  	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
  208.  	ok(hash_len != 0, "cookies: FNV64 server cookie output");
  209.  	{
  210. -		uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b };

  211. +		uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e };

  212.  		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
  213.  	}
  214.  
  215. -- 

  216. 2.7.4
  217.