diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-08-31 09:56:10 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2008-08-31 09:56:10 +0000 |
| commit | 61d2d92a48f22fd957dfe5fbe004b9f0a2ef1698 (patch) | |
| tree | 78a8c7d03b456cc3c7865f4c5302c56af6b35095 /macros | |
| parent | b3b5139246a7955ecd7d756bd4f3f5eb74410101 (diff) | |
| download | neon-61d2d92a48f22fd957dfe5fbe004b9f0a2ef1698.tar.gz | |
Support PKCS#11 in OpenSSL builds:
* src/ne_openssl.c (ne__ssl_clicert_exkey_import): New function.
* src/ne_privssl.h (ne__ssl_clicert_exkey_import): New prototype.
* src/ne_pkcs11.c [HAVE_OPENSSL] (pk11_rsa_sign, pk11_rsa_init,
pk11_rsa_finish, pk11_rsa_method): New functions.
(pk11_find_pkey): Ignore DSA privkeys if using OpenSSL.
(ne_ssl_set_pkcs11_provider): Omit GnuTLS code for OpenSSL.
* macros/neon.m4 (NEON_SSL): Support pakchois with OpenSSL too.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1541 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/neon.m4 | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index b219eb1..a6e28f5 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -979,19 +979,6 @@ gnutls) if test ${ac_cv_func_gnutls_x509_dn_get_rdn_ava}X${ac_cv_header_iconv_h} = yesXyes; then AC_CHECK_FUNCS(iconv) fi - - if test x${ac_cv_func_gnutls_sign_callback_set} = xyes; then - if test "$with_pakchois" != "no"; then - # PKCS#11... ho! - NE_PKG_CONFIG(NE_PK11, pakchois, - [AC_MSG_NOTICE(using pakchois for PKCS11 support) - AC_DEFINE(HAVE_PAKCHOIS, 1, [Define if pakchois library supported]) - CPPFLAGS="$CPPFLAGS ${NE_PK11_CFLAGS}" - NEON_LIBS="${NEON_LIBS} ${NE_PK11_LIBS}"], - [AC_MSG_NOTICE(pakchois library not found; no PKCS11 support)]) - fi - fi - ;; *) # Default to off; only create crypto-enabled binaries if requested. NE_DISABLE_SUPPORT(SSL, [SSL support is not enabled]) @@ -1035,6 +1022,18 @@ posix|yes) ;; esac +case ${with_pakchois}X${ac_cv_func_gnutls_sign_callback_set}Y${ne_cv_lib_ssl097} in +noX*Y*) ;; +*X*Yyes|*XyesX*) + # PKCS#11... ho! + NE_PKG_CONFIG(NE_PK11, pakchois, + [AC_MSG_NOTICE(using pakchois for PKCS11 support) + AC_DEFINE(HAVE_PAKCHOIS, 1, [Define if pakchois library supported]) + CPPFLAGS="$CPPFLAGS ${NE_PK11_CFLAGS}" + NEON_LIBS="${NEON_LIBS} ${NE_PK11_LIBS}"], + [AC_MSG_NOTICE(pakchois library not found; no PKCS11 support)]) + ;; +esac ]) dnl Check for Kerberos installation |