diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index 6a2bd2e9..89accb8c 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_OPENSSL -#define USE_PKCS15_INIT -#endif - #include #include #include "sc-pkcs11.h" diff --git a/src/pkcs11/framework-pkcs15init.c b/src/pkcs11/framework-pkcs15init.c index c00a2569..a20a4f76 100644 --- a/src/pkcs11/framework-pkcs15init.c +++ b/src/pkcs11/framework-pkcs15init.c @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_OPENSSL -#define USE_PKCS15_INIT -#endif - #include #include #include "sc-pkcs11.h" diff --git a/src/pkcs11/sc-pkcs11.h b/src/pkcs11/sc-pkcs11.h index 1c40c8ef..bbabf641 100644 --- a/src/pkcs11/sc-pkcs11.h +++ b/src/pkcs11/sc-pkcs11.h @@ -41,6 +41,11 @@ #pragma pack(pop, cryptoki) #endif +/* Decide whether to use pkcs11 for initialization support */ +#ifdef HAVE_OPENSSL +# define USE_PKCS15_INIT +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/src/pkcs11/slot.c b/src/pkcs11/slot.c index 8bd6752c..4cc32ddb 100644 --- a/src/pkcs11/slot.c +++ b/src/pkcs11/slot.c @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_OPENSSL -#define USE_PKCS15_INIT -#endif - #include #include "sc-pkcs11.h"