summaryrefslogtreecommitdiff
path: root/neon.mak
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2008-02-06 21:31:30 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2008-02-06 21:31:30 +0000
commit6128883f676a8ecf9aa918eb8d3523a895bed6a8 (patch)
treece0ef015db165af94c85ddc8658632686f524854 /neon.mak
parentf4a8bb343cad90605e113abb7d8778cca1d7c1bc (diff)
downloadneon-6128883f676a8ecf9aa918eb8d3523a895bed6a8.tar.gz
Initial support for PKCS#11, based on the pakchois PKCS#11 library:
* src/ne_pkcs11.c, src/ne_pkcs11: New files. * src/ne_gnutls.c (struct ne_ssl_client_cert_s): Add keyless flag. (dup_client_cert): Support keyless clicerts. (ne__ssl_clicert_exkey_import): New function. (provide_client_cert): Use proper GnuTLS error codes in failure cases. * src/ne_privssl.h (ne__ssl_clicert_exkey_import) [HAVE_GNUTLS]: Add prototype. * src/ne_private.h: Include ne_pkcs11.h. (struct ne_session_s): Add pin callback and userdata. * src/ne_session.c (ne_ssl_set_pkcs11_pin): New function. * src/Makefile.in, neon.mak: Build ne_pkcs11.c. * macros/neon.m4 (NEON_SSL): Check for pakchois. git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1329 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'neon.mak')
-rw-r--r--neon.mak3
1 files changed, 3 insertions, 0 deletions
diff --git a/neon.mak b/neon.mak
index d77b2a9..9c580b5 100644
--- a/neon.mak
+++ b/neon.mak
@@ -116,6 +116,7 @@ LIB32_OBJS= \
"$(INTDIR)\ne_dates.obj" \
"$(INTDIR)\ne_i18n.obj" \
"$(INTDIR)\ne_md5.obj" \
+ "$(INTDIR)\ne_pkcs11.obj" \
"$(INTDIR)\ne_redirect.obj" \
"$(INTDIR)\ne_request.obj" \
"$(INTDIR)\ne_session.obj" \
@@ -174,6 +175,7 @@ CLEAN: $(ZLIB_CLEAN)
-@erase "$(INTDIR)\ne_session.obj"
-@erase "$(INTDIR)\ne_openssl.obj"
-@erase "$(INTDIR)\ne_stubssl.obj"
+ -@erase "$(INTDIR)\ne_pkcs11.obj"
-@erase "$(INTDIR)\ne_socket.obj"
-@erase "$(INTDIR)\ne_sspi.obj"
-@erase "$(INTDIR)\ne_string.obj"
@@ -220,6 +222,7 @@ CLEAN: $(ZLIB_CLEAN)
"$(INTDIR)\ne_session.obj": .\src\ne_session.c
"$(INTDIR)\ne_openssl.obj": .\src\ne_openssl.c
"$(INTDIR)\ne_stubssl.obj": .\src\ne_stubssl.c
+"$(INTDIR)\ne_pkcs11.obj": .\src\ne_pkcs11.c
"$(INTDIR)\ne_socket.obj": .\src\ne_socket.c
"$(INTDIR)\ne_sspi.obj": .\src\ne_sspi.c
"$(INTDIR)\ne_string.obj": .\src\ne_string.c