[pkg-opensc-commit] [libp11] 52/239: fixes to make it compile 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 libp11.

commit 48cd16fe5e80c3a1ce1db03aa3b174c1662ee397
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Mon Sep 19 13:43:07 2005 +0000

    fixes to make it compile on windows.
---
 src/Makefile.mak | 11 +++++++----
 src/libp11-int.h |  2 +-
 src/libp11.h     |  2 +-
 src/p11_key.c    |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.mak b/src/Makefile.mak
index 92b62b8..6050924 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -1,12 +1,15 @@
-OPENSSL_INCL_DIR = /IC:\openssl\include
+LIBLTDL_INC =    # E.g. /IC:\libtool-1.5.8-lib\include
+LIBLTDL_LIB =     # E.g. C:\libtool-1.5.8-lib\lib\libltdl.lib
+
+OPENSSL_INC = /IC:\openssl\include
 OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
 
-COPTS = /Zi /MD /nologo $(OPENSSL_INCL_DIR) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF)
+COPTS = /Zi /MD /nologo /I..\rsaref $(OPENSSL_INC) $(LIBLTDL_INC) /D_WIN32_WINNT=0x0400
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
 TARGET                  = libp11.dll
 
-OBJECTS                 = p11_attr.obj p11_cert.obj p11_err.obj \
+OBJECTS                 = libpkcs11.obj p11_attr.obj p11_cert.obj p11_err.obj \
 	p11_key.obj p11_load.obj p11_misc.obj p11_rsa.obj p11_slot.obj p11_ops.obj
 
 all: $(TARGET)
@@ -17,4 +20,4 @@ all: $(TARGET)
 $(TARGET): $(OBJECTS) 
 	perl makedef.pl $*.def $* $(OBJECTS)
 	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
-		$(OBJECTS) $(OPENSSL_LIB)
+		$(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB)
diff --git a/src/libp11-int.h b/src/libp11-int.h
index c275e03..ca7fb78 100644
--- a/src/libp11-int.h
+++ b/src/libp11-int.h
@@ -28,7 +28,7 @@
 extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
 extern CK_RV C_UnloadModule(void *module);
 
-#include <libp11.h>
+#include "libp11.h"
 
 /* get private implementations of PKCS11 structures */
 
diff --git a/src/libp11.h b/src/libp11.h
index fe1a1ea..3e24105 100644
--- a/src/libp11.h
+++ b/src/libp11.h
@@ -124,7 +124,7 @@ extern int PKCS11_enumerate_keys(PKCS11_TOKEN *, PKCS11_KEY **, unsigned int *);
 extern int PKCS11_get_key_type(PKCS11_KEY *);
 
 /* Get size of key modulus in number of bytes */
-extern int PKCS11_get_key_size(PKCS11_KEY *);
+extern int PKCS11_get_key_size(const PKCS11_KEY *);
 /* Get actual modules and public exponent as BIGNUM */
 extern int PKCS11_get_key_modulus(PKCS11_KEY *, BIGNUM **);
 extern int PKCS11_get_key_exponent(PKCS11_KEY *, BIGNUM **);
diff --git a/src/p11_key.c b/src/p11_key.c
index f6785e0..af4d6ce 100644
--- a/src/p11_key.c
+++ b/src/p11_key.c
@@ -433,7 +433,7 @@ int PKCS11_get_key_exponent(PKCS11_KEY * key, BIGNUM **bn)
 }
 
 
-int PKCS11_get_key_size(PKCS11_KEY * key) 
+int PKCS11_get_key_size(const PKCS11_KEY * key) 
 {
    BIGNUM* n;
    int numbytes=0;

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