- put the definition of USE_PKCS15_INIT into a place where it can actually work

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@675 c6295689-39f2-0310-b995-f0e70906c6a9
2002-08-19 17:13:46 +00:00 · 2002-08-19 17:13:46 +00:00 · 1556f98ba5
parent 2fc2357639
commit 1556f98ba5
4 changed files with 5 additions and 12 deletions
--- 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 <stdlib.h>
 #include <string.h>
 #include "sc-pkcs11.h"
--- 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 <stdlib.h>
 #include <string.h>
 #include "sc-pkcs11.h"
--- 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
--- 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 <string.h>
 #include "sc-pkcs11.h"