diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-24 13:07:50 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-24 13:07:50 +0000 |
commit | 4364b5c5ca47451110760faf1e0bf3d07fd26130 (patch) | |
tree | a388efb1d31899446240ac6d366c101a2a4fe4c4 | |
parent | 79d2e869b8c7a4820f63d013024ec34940185461 (diff) | |
download | gnunet-4364b5c5ca47451110760faf1e0bf3d07fd26130.tar.gz gnunet-4364b5c5ca47451110760faf1e0bf3d07fd26130.zip |
-fix check for DANE and ftbfs
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3f8da0470..6a9f038cb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1024,8 +1024,8 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS]) | |||
1024 | gnutls_dane=0 | 1024 | gnutls_dane=0 |
1025 | AC_CHECK_HEADERS([gnutls/dane.h], | 1025 | AC_CHECK_HEADERS([gnutls/dane.h], |
1026 | AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], | 1026 | AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw], |
1027 | gnutls_dane=true)) | 1027 | gnutls_dane=1)) |
1028 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = xtrue) | 1028 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) |
1029 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) | 1029 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) |
1030 | 1030 | ||
1031 | 1031 | ||
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index ba022d545..1ffcd75e1 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -898,7 +898,7 @@ check_ssl_certificate (struct Socks5Request *s5r) | |||
898 | if (0 != (rc = dane_verify_crt_raw (dane_state, | 898 | if (0 != (rc = dane_verify_crt_raw (dane_state, |
899 | chainp, | 899 | chainp, |
900 | cert_list_size, | 900 | cert_list_size, |
901 | gnutls_certificate_type_get (tlsinfo.internals), | 901 | gnutls_certificate_type_get (tlsinfo->internals), |
902 | dane_query, | 902 | dane_query, |
903 | 0, 0, | 903 | 0, 0, |
904 | &verify))) | 904 | &verify))) |