forked from enlightenment/efl
* eet: Correctly detect GNUTLS hability.
SVN revision: 44548
This commit is contained in:
parent
41b0fb73a0
commit
e24ddfb0a0
|
@ -95,11 +95,11 @@ AC_MSG_RESULT([${want_gnutls}])
|
||||||
|
|
||||||
# Specific GNUTLS improvement
|
# Specific GNUTLS improvement
|
||||||
|
|
||||||
new_gnutls_api="no"
|
new_gnutls_api="yes"
|
||||||
AC_ARG_ENABLE(new-gnutls-api,
|
AC_ARG_ENABLE(new-gnutls-api,
|
||||||
[AC_HELP_STRING(
|
[AC_HELP_STRING(
|
||||||
[--enable-new-gnutls-api],
|
[--disable-new-gnutls-api],
|
||||||
[enable use of gnutls_x509_crt_verify_hash. [[default=disable]]]
|
[enable use of gnutls_x509_crt_verify_hash. [[default=enable]]]
|
||||||
)],
|
)],
|
||||||
[new_gnutls_api=$enableval]
|
[new_gnutls_api=$enableval]
|
||||||
)
|
)
|
||||||
|
@ -107,9 +107,14 @@ AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash])
|
||||||
AC_MSG_RESULT([${new_gnutls_api}])
|
AC_MSG_RESULT([${new_gnutls_api}])
|
||||||
|
|
||||||
if test "x${new_gnutls_api}" = "xyes" ; then
|
if test "x${new_gnutls_api}" = "xyes" ; then
|
||||||
|
AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash,
|
||||||
|
[ new_gnutls_api="yes" ],
|
||||||
|
[ new_gnutls_api="no" ]
|
||||||
|
)
|
||||||
|
|
||||||
|
if test "x${new_gnutls_api}" = "xyes"; then
|
||||||
AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash])
|
AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash])
|
||||||
else
|
fi
|
||||||
AC_DEFINE(EET_USE_NEW_GNUTLS_API, 0, [don't use gnutls_x509_crt_verify_hash])
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Openssl support
|
# Openssl support
|
||||||
|
|
|
@ -558,11 +558,13 @@ eet_identity_check(const void *data_base, unsigned int data_length,
|
||||||
|
|
||||||
# ifdef HAVE_GNUTLS
|
# ifdef HAVE_GNUTLS
|
||||||
gnutls_x509_crt_t cert;
|
gnutls_x509_crt_t cert;
|
||||||
gcry_md_hd_t md;
|
|
||||||
gnutls_datum_t datum;
|
gnutls_datum_t datum;
|
||||||
gnutls_datum_t signature;
|
gnutls_datum_t signature;
|
||||||
|
# if EET_USE_NEW_GNUTLS_API
|
||||||
unsigned char *hash;
|
unsigned char *hash;
|
||||||
|
gcry_md_hd_t md;
|
||||||
int err;
|
int err;
|
||||||
|
# endif
|
||||||
|
|
||||||
/* Create an understanding certificate structure for gnutls */
|
/* Create an understanding certificate structure for gnutls */
|
||||||
datum.data = (void *)cert_der;
|
datum.data = (void *)cert_der;
|
||||||
|
|
Loading…
Reference in New Issue