upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 07:41:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix test for openssl to use HMAC_Update for 1.1.0.

Browse source 
- acx_nlnetlabs.m4 to v33, with HMAC_Update.


git-svn-id: file:///svn/unbound/trunk@3685 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-03-21 10:10:10 +00:00
parent 2958b53293
commit 728fce7494
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
acx_nlnetlabs.m4
View file

@ -2,7 +2,8 @@
# Copyright 2009, Wouter Wijngaards, NLnet Labs. # Copyright 2009, Wouter Wijngaards, NLnet Labs.
# BSD licensed. # BSD licensed.
# #
# Version 32 # Version 33
# 2016-03-21 Use HMAC_Update instead of HMAC_CTX_Init (for openssl-1.1.0).
# 2016-01-04 -D_DEFAULT_SOURCE defined with -D_BSD_SOURCE for Linux glibc 2.20 # 2016-01-04 -D_DEFAULT_SOURCE defined with -D_BSD_SOURCE for Linux glibc 2.20
# 2015-12-11 FLTO check for new OSX, clang. # 2015-12-11 FLTO check for new OSX, clang.
# 2015-11-18 spelling check fix. # 2015-11-18 spelling check fix.
@ -671,16 +672,16 @@ AC_DEFUN([ACX_SSL_CHECKS], [
ACX_RUNTIME_PATH_ADD([$ssldir/lib]) ACX_RUNTIME_PATH_ADD([$ssldir/lib])
fi fi
AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto]) AC_MSG_CHECKING([for HMAC_Update in -lcrypto])
LIBS="$LIBS -lcrypto" LIBS="$LIBS -lcrypto"
LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
AC_TRY_LINK(, [ AC_TRY_LINK(, [
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
], [ ], [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, AC_DEFINE([HAVE_HMAC_UPDATE], 1,
[If you have HMAC_CTX_init]) [If you have HMAC_Update])
], [ ], [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
# check if -lwsock32 or -lgdi32 are needed. # check if -lwsock32 or -lgdi32 are needed.
@ -690,11 +691,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32" LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32"
AC_MSG_CHECKING([if -lcrypto needs -lgdi32]) AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
AC_TRY_LINK([], [ AC_TRY_LINK([], [
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
],[ ],[
AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, AC_DEFINE([HAVE_HMAC_UPDATE], 1,
[If you have HMAC_CTX_init]) [If you have HMAC_Update])
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -704,11 +705,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
LIBSSL_LIBS="$LIBSSL_LIBS -ldl" LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
AC_MSG_CHECKING([if -lcrypto needs -ldl]) AC_MSG_CHECKING([if -lcrypto needs -ldl])
AC_TRY_LINK([], [ AC_TRY_LINK([], [
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
],[ ],[
AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, AC_DEFINE([HAVE_HMAC_UPDATE], 1,
[If you have HMAC_CTX_init]) [If you have HMAC_Update])
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

4
config.h.in
View file

@ -191,8 +191,8 @@
/* Define to 1 if you have the <grp.h> header file. */ /* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H #undef HAVE_GRP_H
/* If you have HMAC_CTX_init */ /* If you have HMAC_Update */
#undef HAVE_HMAC_CTX_INIT #undef HAVE_HMAC_UPDATE
/* Define to 1 if you have the `inet_aton' function. */ /* Define to 1 if you have the `inet_aton' function. */
#undef HAVE_INET_ATON #undef HAVE_INET_ATON

22
configure vendored
View file

@ -17107,8 +17107,8 @@ $as_echo "found in $ssldir" >&6; }
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_CTX_init in -lcrypto" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Update in -lcrypto" >&5
$as_echo_n "checking for HMAC_CTX_init in -lcrypto... " >&6; } $as_echo_n "checking for HMAC_Update in -lcrypto... " >&6; }
LIBS="$LIBS -lcrypto" LIBS="$LIBS -lcrypto"
LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -17118,8 +17118,8 @@ int
main () main ()
{ {
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
; ;
return 0; return 0;
@ -17130,7 +17130,7 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h $as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
else else
@ -17151,8 +17151,8 @@ int
main () main ()
{ {
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
; ;
return 0; return 0;
@ -17161,7 +17161,7 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h $as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
@ -17183,8 +17183,8 @@ int
main () main ()
{ {
int HMAC_CTX_init(void); int HMAC_Update(void);
(void)HMAC_CTX_init(); (void)HMAC_Update();
; ;
return 0; return 0;
@ -17193,7 +17193,7 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h $as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }

4
doc/Changelog
View file

@ -1,6 +1,8 @@
21 March 2016: Ralph 21 March 2016: Wouter
- Fix compile of getentropy_linux for SLES11 servicepack 4. - Fix compile of getentropy_linux for SLES11 servicepack 4.
- Fix dnstap-log-resolver-response-messages, from Nikolay Edigaryev. - Fix dnstap-log-resolver-response-messages, from Nikolay Edigaryev.
- Fix test for openssl to use HMAC_Update for 1.1.0.
- acx_nlnetlabs.m4 to v33, with HMAC_Update.
18 March 2016: Ralph 18 March 2016: Ralph
- Validate QNAME minimised NXDOMAIN responses. - Validate QNAME minimised NXDOMAIN responses.