From d7e3784c77d2648bf9a8a3c767a7978bd77a0c0b Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 8 Sep 2009 06:00:11 +0000
Subject: [PATCH] Now that include files are in place in the opencryptoki
 subdirectory, remove "#ifndef OPENCRYPTOKI" conditionals

---
 contrib/pkcs11-keygen/destroyobj.c | 5 -----
 contrib/pkcs11-keygen/genkey.c     | 5 -----
 contrib/pkcs11-keygen/listobjs.c   | 5 -----
 contrib/pkcs11-keygen/readkey.c    | 5 -----
 contrib/pkcs11-keygen/set_key_id.c | 5 -----
 contrib/pkcs11-keygen/writekey.c   | 5 -----
 6 files changed, 30 deletions(-)

diff --git a/contrib/pkcs11-keygen/destroyobj.c b/contrib/pkcs11-keygen/destroyobj.c
index 0883978403..e7068e4d62 100644
--- a/contrib/pkcs11-keygen/destroyobj.c
+++ b/contrib/pkcs11-keygen/destroyobj.c
@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])
diff --git a/contrib/pkcs11-keygen/genkey.c b/contrib/pkcs11-keygen/genkey.c
index d1269243d4..45a9e3cd68 100644
--- a/contrib/pkcs11-keygen/genkey.c
+++ b/contrib/pkcs11-keygen/genkey.c
@@ -17,12 +17,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 /* Define static key template values */
 static CK_BBOOL truevalue = TRUE;
diff --git a/contrib/pkcs11-keygen/listobjs.c b/contrib/pkcs11-keygen/listobjs.c
index efe95ee278..3fb6eaa80f 100644
--- a/contrib/pkcs11-keygen/listobjs.c
+++ b/contrib/pkcs11-keygen/listobjs.c
@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])
diff --git a/contrib/pkcs11-keygen/readkey.c b/contrib/pkcs11-keygen/readkey.c
index 551e90fdf8..ced0fa9c0a 100644
--- a/contrib/pkcs11-keygen/readkey.c
+++ b/contrib/pkcs11-keygen/readkey.c
@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/rsa.h>
diff --git a/contrib/pkcs11-keygen/set_key_id.c b/contrib/pkcs11-keygen/set_key_id.c
index f2d8bcb8cf..3cb1cd3a04 100644
--- a/contrib/pkcs11-keygen/set_key_id.c
+++ b/contrib/pkcs11-keygen/set_key_id.c
@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])
diff --git a/contrib/pkcs11-keygen/writekey.c b/contrib/pkcs11-keygen/writekey.c
index d0aacb2702..b532963d4a 100644
--- a/contrib/pkcs11-keygen/writekey.c
+++ b/contrib/pkcs11-keygen/writekey.c
@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 #include <openssl/conf.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>