logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

1.0.2-Replace-res_randomid_with_arc4random.patch (1850B)

    

  1. From fb2c3b37d1022d84506ca0815c7c888c4f08e90c Mon Sep 17 00:00:00 2001

  2. From: xentec <xentec@aix0.eu>

  3. Date: Sat, 11 Feb 2017 14:39:24 +0000

  4. Subject: [PATCH 2/3] Replace missing res_randomid() with the more secure

  5.  arc4random()

  6. 

  7. ---

  8.  configure.ac                    | 2 ++

  9.  openbsd-compat/openbsd-compat.h | 2 ++

  10.  src/res_mkquery.c               | 2 +-

  11.  src/res_send_async.c            | 2 +-

  12.  4 files changed, 6 insertions(+), 2 deletions(-)

  13. 

  14. diff --git a/configure.ac b/configure.ac

  15. index 10aff04..fa0e896 100644

  16. --- a/configure.ac

  17. +++ b/configure.ac

  18. @@ -264,6 +264,8 @@ AC_ARG_WITH([Werror],

  19.  )

  20.  #l325

  21.  

  22. +LIBS="-lcrypto $LIBS"

  23. +

  24.  AC_CHECK_HEADERS([ \

  25.  	crypt.h \

  26.  	dirent.h \

  27. diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h

  28. index c30591c..9be2e0b 100644

  29. --- a/openbsd-compat/openbsd-compat.h

  30. +++ b/openbsd-compat/openbsd-compat.h

  31. @@ -123,4 +123,6 @@ int res_hnok(const char *);

  32.  int clock_gettime(int, struct timespec *);

  33.  #endif

  34.  

  35. +unsigned int arc4random(void);

  36. +

  37.  #endif /* _OPENBSD_COMPAT_H */

  38. diff --git a/src/res_mkquery.c b/src/res_mkquery.c

  39. index 27ed21e..cce4029 100644

  40. --- a/src/res_mkquery.c

  41. +++ b/src/res_mkquery.c

  42. @@ -57,7 +57,7 @@ res_mkquery(int op, const char *dname, int class, int type,

  43.  	ac = asr_use_resolver(NULL);

  44.  

  45.  	memset(&h, 0, sizeof h);

  46. -	h.id = res_randomid();

  47. +	h.id = arc4random();

  48.  	if (ac->ac_options & RES_RECURSE)

  49.  		h.flags |= RD_MASK;

  50.  	h.qdcount = 1;

  51. diff --git a/src/res_send_async.c b/src/res_send_async.c

  52. index a60aa0d..a0f4704 100644

  53. --- a/src/res_send_async.c

  54. +++ b/src/res_send_async.c

  55. @@ -380,7 +380,7 @@ setup_query(struct asr_query *as, const char *name, const char *dom,

  56.  	as->as.dns.obuflen = 0;

  57.  

  58.  	memset(&h, 0, sizeof h);

  59. -	h.id = res_randomid();

  60. +	h.id = arc4random();

  61.  	if (as->as_ctx->ac_options & RES_RECURSE)

  62.  		h.flags |= RD_MASK;

  63.  	h.qdcount = 1;

  64. -- 

  65. 2.11.1

  66.