summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-06-09 20:29:04 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-01 18:09:26 +0200
commit4afe40aab76d87b9ff77907d374d6e7f70ab6e21 (patch)
treeb17a1850d4bcbd34d0cbab9cdd1f40c1f07e1abe
parent48392b2f88ac03e87df2dc376faa4376359b39f4 (diff)
downloadgnutls-4afe40aab76d87b9ff77907d374d6e7f70ab6e21.tar.gz
Use pkcs11.h specification file from p11-kit.
* Remove one included briefly in gnutls. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/pkcs11_int.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2e40e189af..0ef044abcf 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -110,7 +110,7 @@ HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h \
ext_safe_renegotiation.h locks.h gnutls_mbuffers.h
if ENABLE_PKCS11
-HFILES += pkcs11_int.h pkcs11_spec.h
+HFILES += pkcs11_int.h
endif
# Separate so we can create the documentation
diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
index c0b8dde4f8..586def9bd1 100644
--- a/lib/pkcs11_int.h
+++ b/lib/pkcs11_int.h
@@ -11,6 +11,7 @@
#define P11_KIT_API_SUBJECT_TO_CHANGE 1
#include <p11-kit/uri.h>
+#include <p11-kit/pkcs11.h>
typedef unsigned char ck_bool_t;