alonbl
54c1c735f3
Attached are the latest mode to OpenSC svn 3462 to use the Makefile.mak
...
files to build on Windows.
I got rutoken to compile, and took out the #ifdef's I had in last week.
The rutoken programmer declared some variables in the middle of a block
rather then having all the declare statements at the beginning of a block
as is normally done in C. The Microsoft compile treats this as an error.
(Actual many errors.)
The makedef.pl is no longer needed, as the exports files can be used.
Note that in the original Makefile.mak files only opensc.def and
pkcs15init.def were created.
winconfig.h has a number of changes. As discussed last week this could
be created by autoconf. I also noted that the Active State Perl that
was required for the makedef.pl has a psed command that could be used
like sed to update winconfig.h. I did not attempt to do this.
win32/Make.rules.mak - Use ENABLE_OPENSSL and ENABLE_ZLIB
src/tools/Makefile.mak - add the rutoken.tool.exe
src/tools/eidenv.c - use PACKAGE_VERSION
src/pkcs11/Makefile.mak - reorder the objest to match the list in the
Makefile.am. Makes it easier to read.
src/include/winconfig.h - The windows version of the config.h
Changes based on discussions on the list last week.
src/common/Makefile.mak - renamed modules.
src/pkcs15init/Makefile.mak - reordered, and added back the rutoken modules
replaced the use of makdef.pl to sue the exports file.
src/scconf/Makefile.mak - reordered objects.
src/libopensc/card-rutoken.c -
error. Moved the declares to the beginning of blocks.
src/libopensc/Makefile.mak - reorder names, and add rutoken.
Use the libopensc.exports file.
src/libopensc/pkcs15-prkey-rutoken.c - more moving of declare statements.
By Douglas E. Engert
http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011011.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3464 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-07 19:42:43 +00:00
alonbl
66d819a3a6
ruToken C fixups
...
http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011011.html
By Douglas E. Engert
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3463 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-07 19:25:21 +00:00
alonbl
6e65efb257
Some more build cleanups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3462 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 20:38:20 +00:00
alonbl
376139d1f1
Fix future issue with distcheck
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3461 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 19:21:59 +00:00
alonbl
6f22611438
Fix some duplicate symbols with Windows header files.
...
Thanks to Douglas E. Engert.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3460 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 16:46:50 +00:00
alonbl
e4eeba26cd
Fix MSVC compiler error
...
http://www.opensc-project.org/pipermail/opensc-devel/2008-April/010997.html
Thanks to Douglas E. Engert
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3459 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 16:21:08 +00:00
alonbl
ac0c291f9c
Fixup WINAPI location
...
By: Douglas E. Engert
(2) Change the typdefs for the SC_*_t routines.
The WINAPI had to be moved. For example from:
typedef PCSC_API LONG (*SCardEstablishContext_t)...
to:
typedef LONG (PCSC_API *SCardEstablishContext_t)...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3458 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 06:05:38 +00:00
alonbl
317ad765c5
Solve some Windows conflicts
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3457 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-04 05:39:34 +00:00
alonbl
94d884922c
Fix default PC/SC provider for darwin, thanks to Martin Paljak
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3456 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-02 19:48:12 +00:00
alonbl
0e2c664d34
Rename PC/SC library into PC/SC provider.
...
Sync symbols between configuration and source.
Put default provider in opensc.conf, opensc-tool.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3455 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-02 05:44:12 +00:00
alonbl
65a427e419
Ignore -svn component so distcheck will pass for svn versions
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3454 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 20:41:07 +00:00
alonbl
47c7cf2bbe
Readd -svn version suffix, removed at revision 3446
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3453 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 20:32:28 +00:00
alonbl
3f7aa03520
Add --with-pcsc-module to configure
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3452 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 20:10:43 +00:00
alonbl
c9b19135fc
More separate srcdir fixups, make distcheck work
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3451 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 19:58:30 +00:00
alonbl
87db3c96c2
More separate srcdir fixups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3450 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 19:04:33 +00:00
alonbl
39abe22798
More separate srcdir fixups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3449 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 17:08:17 +00:00
alonbl
503b028acb
More separate srcdir fixups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3448 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 16:55:23 +00:00
ludovic.rousseau
13878512f5
do not use api/*/*.xml but explicitely expand the first * to avoid
...
catching api/xsl-stylesheets/catalog.xml
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3447 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 13:04:48 +00:00
ludovic.rousseau
69dd0baf30
use $(srcdir) for dist_noinst_DATA
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3446 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 13:01:43 +00:00
ludovic.rousseau
7e30721378
use $(srcdir) when needed to be able to build in separate build
...
directories using: cd foobar ; ../configure srcdir=..
Thanks to Douglas E. Engert for the patch
http://www.opensc-project.org/pipermail/opensc-devel/2008-March/010959.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3445 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 12:43:26 +00:00
ludovic.rousseau
9ffe2e159d
use "pkcs15.h" instead of <opensc/pkcs15.h> (and similar)
...
Thanks to Douglas E. Engert for the patch
http://www.opensc-project.org/pipermail/opensc-devel/2008-March/010959.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3444 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 12:35:08 +00:00
ludovic.rousseau
77fac9721f
#include <opensc/pkcs15.h> to avoid a compilation warning
...
rutoken.h:4: warning: 'struct sc_pkcs15_prkey' declared inside parameter
list
rutoken.h:4: warning: its scope is only this definition or declaration,
which is probably not what you want
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3443 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-01 09:32:40 +00:00
alonbl
9d20a071d6
Trivial
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3442 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-29 20:34:38 +00:00
alonbl
2f997da125
Install PKCS#11 providers at bin for Windows
...
This will place file in more expected location, and
reduce runtime dependencies as dependency DLL will be located
at the same directory.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3441 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-27 14:13:00 +00:00
alonbl
80a16f686d
ruToken cleanups
...
Move constants out of standard files.
Create ruToken specific interface.
Update symbols.
Thread at:
http://www.opensc-project.org/pipermail/opensc-devel/2008-March/010917.html
Cleanup of:
http://www.opensc-project.org/pipermail/opensc-devel/2007-December/010617.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3439 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-26 06:24:37 +00:00
alonbl
d0e0dd2820
Cleanup conventions to meet other OpenSC projects
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3438 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-24 16:05:31 +00:00
alonbl
500b36ae08
Revert last
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3434 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-20 13:36:50 +00:00
alonbl
622e3425e3
Need AC_LIBTOOL_DLOPEN for PKCS#11 module
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3433 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-20 13:06:57 +00:00
alonbl
314f2a5501
Cygwin should load .dll version of PKCS#11
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3432 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-19 21:23:47 +00:00
alonbl
a88a543940
Fixup compile under cygwin
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3431 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-19 20:30:36 +00:00
ludovic.rousseau
8436f089c5
pkcs15-gemsafeV1.c:478: warning: 'sc_pkcs15emu_add_pubkey' defined but
...
not used
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3430 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-17 15:17:56 +00:00
ludovic.rousseau
4f53d06c17
change type from int to unsigned int to avoid 2 compiler warnings:
...
pkcs15-gemsafeV1.c:150: warning: comparison between signed and unsigned
pkcs15-gemsafeV1.c:331: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3429 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-17 15:09:16 +00:00
ludovic.rousseau
2800607c4a
rename index -> index_local to avoid a compiler warning
...
pkcs15-gemsafeV1.c:126: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:304: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3428 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-17 15:09:16 +00:00
ludovic.rousseau
875d99e46a
use sc_debug/sc_error instead of fprintf(stderr, ...)
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3427 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-17 15:09:16 +00:00
ludovic.rousseau
a05564447a
add ATR for the GemSafeXpresso 16k R3.2
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3426 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-17 15:03:51 +00:00
alonbl
5217ebc2d2
Fix opensc.conf dist again
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3425 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-15 19:58:28 +00:00
alonbl
760b89f37e
Don't distribute opensc.conf
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3424 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-15 18:12:58 +00:00
alonbl
97a3455e6c
Fix typo
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3423 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-15 13:24:44 +00:00
alonbl
5e5a053e9a
Fixup autoconf detection
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3422 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-15 13:24:05 +00:00
alonbl
f49f765ac6
Fix libtool versioning issues
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3421 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-15 11:05:26 +00:00
alonbl
1635782e62
Fixup autoconf help
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3420 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-14 21:26:42 +00:00
alonbl
3e78a50edc
Minor cleanups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3419 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-14 07:44:09 +00:00
alonbl
c7d2788f01
Support >=autoconf-2.60
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3418 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-10 18:17:56 +00:00
aj
2761549c11
use new MKDIR_P macro, but depend on automake >= 1.10.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3417 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-10 16:38:01 +00:00
alonbl
7ec2b320d6
Remove emptyline
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3416 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-10 07:10:53 +00:00
aj
b0ad68658e
automake&co define mkdir_p, not MKDIR_P.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3415 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-10 06:45:23 +00:00
alonbl
8ac87f1b1e
Remove useless comments
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3414 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-09 21:24:24 +00:00
alonbl
5e4abcc675
Some build cleanups
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3413 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-09 19:44:12 +00:00
alonbl
72449f0635
Make export-wiki.sh static across projects
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3412 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-09 15:34:28 +00:00
alonbl
679a4c04de
export-wiki.xsl now works with new trac
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3411 c6295689-39f2-0310-b995-f0e70906c6a9
2008-03-09 15:13:11 +00:00