View | Details | Raw Unified | Return to bug 1276 | Differences between
and this patch

Collapse All | Expand All

(-)b/dnscrypt/dnscrypt.h (-4 lines)
 Lines 35-44    Link Here 
35
#define DNSCRYPT_REPLY_HEADER_SIZE \
35
#define DNSCRYPT_REPLY_HEADER_SIZE \
36
    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_HALF_NONCEBYTES * 2 + crypto_box_MACBYTES)
36
    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_HALF_NONCEBYTES * 2 + crypto_box_MACBYTES)
37
37
38
#ifdef crypto_box_curve25519xchacha20poly1305_MACBYTES
39
# define HAVE_XCHACHA20 1
40
#endif
41
42
struct sldns_buffer;
38
struct sldns_buffer;
43
struct config_file;
39
struct config_file;
44
struct comm_reply;
40
struct comm_reply;
(-)b/dnscrypt/dnscrypt.m4 (+11 lines)
 Lines 18-25   AC_DEFUN([dnsc_DNSCRYPT], Link Here 
18
    ])
18
    ])
19
    AC_SEARCH_LIBS([sodium_init], [sodium], [],
19
    AC_SEARCH_LIBS([sodium_init], [sodium], [],
20
      AC_MSG_ERROR([The sodium library was not found. Please install sodium!]))
20
      AC_MSG_ERROR([The sodium library was not found. Please install sodium!]))
21
    AC_SEARCH_LIBS([crypto_box_curve25519xchacha20poly1305_beforenm], [sodium],
22
        [
23
            AC_SUBST([ENABLE_DNSCRYPT_XCHACHA20], [1])
24
            AC_DEFINE(
25
                [USE_DNSCRYPT_XCHACHA20], [1],
26
                [Define to 1 to enable dnscrypt with xchacha20 support])
27
        ],
28
        [
29
            AC_SUBST([ENABLE_DNSCRYPT_XCHACHA20], [0])
30
        ])
21
    $1
31
    $1
22
  else
32
  else
33
    AC_SUBST([ENABLE_DNSCRYPT_XCHACHA20], [0])
23
    $2
34
    $2
24
  fi
35
  fi
25
])
36
])
(-)b/dnscrypt/dnscrypt_config.h.in (+6 lines)
 Lines 14-17    Link Here 
14
# endif
14
# endif
15
#endif
15
#endif
16
16
17
#if @ENABLE_DNSCRYPT_XCHACHA20@ /* ENABLE_DNSCRYPT_XCHACHA20 */
18
# ifndef HAVE_XCHACHA20
19
#  define HAVE_XCHACHA20 1
20
# endif
21
#endif
22
17
#endif /* UNBOUND_DNSCRYPT_CONFIG_H */
23
#endif /* UNBOUND_DNSCRYPT_CONFIG_H */

Return to bug 1276