diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-09-17 16:54:05 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-09-17 16:56:11 +0200 |
| commit | c83cf87c29e7dd873f4633a934e47eff27eaaa8f (patch) | |
| tree | f1778febb562ede472c7cf3259b3ae21e67b3c98 | |
| parent | 72b857a5326a5d949536deeb83fd5b3c4c45bbac (diff) | |
| download | gnutls-c83cf87c29e7dd873f4633a934e47eff27eaaa8f.tar.gz | |
depend on p11-kit 0.20.6
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | lib/pkcs11x.h | 28 |
2 files changed, 2 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 73561aab7e..57f8f486b7 100644 --- a/configure.ac +++ b/configure.ac @@ -394,7 +394,7 @@ AC_DEFINE_UNQUOTED([SYSTEM_PRIORITY_FILE], dnl Check for p11-kit -P11_KIT_MINIMUM=0.20.0 +P11_KIT_MINIMUM=0.20.6 AC_ARG_WITH(p11-kit, AS_HELP_STRING([--without-p11-kit], [Build without p11-kit and PKCS#11 support])) @@ -407,9 +407,6 @@ if test "$with_p11_kit" != "no"; then else GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, p11-kit-1" fi - if $PKG_CONFIG --atleast-version=2.20.6 p11-kit; then - AC_DEFINE([HAVE_PKCS11X_H], 1, [There is p11-kit/pkcs11x.h]) - fi else with_p11_kit=no AC_MSG_WARN([[ diff --git a/lib/pkcs11x.h b/lib/pkcs11x.h index 94ef48a330..0aac3f6f10 100644 --- a/lib/pkcs11x.h +++ b/lib/pkcs11x.h @@ -21,32 +21,6 @@ #ifndef PKCS11X_H #define PKCS11X_H -#ifdef HAVE_PKCS11X_H -# include <p11-kit/pkcs11x.h> -#else - -# include <p11-kit/pkcs11.h> - -# ifndef CKA_X_VENDOR -# define CKA_X_VENDOR (CKA_VENDOR_DEFINED | 0x58444700UL) -# endif - -# ifndef CKO_X_VENDOR -# define CKO_X_VENDOR (CKA_VENDOR_DEFINED | 0x58444700UL) -# endif - -# ifndef CKA_X_DISTRUSTED -# define CKA_X_DISTRUSTED (CKA_X_VENDOR + 100) -# endif - -# ifndef CKO_X_CERTIFICATE_EXTENSION -# define CKO_X_CERTIFICATE_EXTENSION (CKO_X_VENDOR + 200) -# endif - -# ifndef CKA_PUBLIC_KEY_INFO -# define CKA_PUBLIC_KEY_INFO 0x00000129UL -# endif - -#endif +#include <p11-kit/pkcs11x.h> #endif |