[pkg-opensc-commit] [engine-pkcs11] 16/152: remove default module name. change include order (some effords to get openssl 0.9.8* to work on windows).

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit e54d7de4b81876d5ff578eb538af079b2ea248cf
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Wed Oct 12 13:20:37 2005 +0000

    remove default module name.
    change include order (some effords to get openssl 0.9.8* to work on windows).
---
 src/engine_pkcs11.c | 13 ++-----------
 src/hw_pkcs11.c     |  7 ++++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/engine_pkcs11.c b/src/engine_pkcs11.c
index b081f47..f63e1f7 100644
--- a/src/engine_pkcs11.c
+++ b/src/engine_pkcs11.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/objects.h>
+#include <openssl/engine.h>
 #include <libp11.h>
 #include "engine_pkcs11.h"
 
@@ -53,17 +54,7 @@ static char *pin = NULL;
 
 int verbose = 0;
 
-#if defined(_WIN32)
-#define PKCS11_DEFAULT_MODULE_NAME	"opensc-pkcs11"
-#elif defined(HAVE_DLFCN_H) && defined(__APPLE__)
-#define PKCS11_DEFAULT_MODULE_NAME	"opensc-pkcs11.so"
-#elif defined(__APPLE__)
-#define PKCS11_DEFAULT_MODULE_NAME	"opensc-pkcs11.bundle"
-#else
-#define PKCS11_DEFAULT_MODULE_NAME	"opensc-pkcs11.so"
-#endif
-
-char *module = PKCS11_DEFAULT_MODULE_NAME;
+char *module = NULL;
 int default_module = 1;
 
 int set_module(const char *modulename)
diff --git a/src/hw_pkcs11.c b/src/hw_pkcs11.c
index 9da606c..82804ce 100644
--- a/src/hw_pkcs11.c
+++ b/src/hw_pkcs11.c
@@ -59,15 +59,16 @@
  *
  */
 
-#include <libp11.h>
 #include <stdio.h>
 #include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/objects.h>
 #include <openssl/engine.h>
+#include <openssl/dso.h>
 #ifndef ENGINE_CMD_BASE
 #error did not get engine.h
 #endif
-#include <openssl/crypto.h>
-#include <openssl/dso.h>
+#include <libp11.h>
 #include "engine_pkcs11.h"
 
 #define PKCS11_ENGINE_ID "pkcs11"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git