vtarasov
a14bbe7e32
opensc-explorer: DF_NAME type path value should not be appended by the file ID ...
...
When composing path to file (for ex. to be read), if the type of parent DF is DF_NAME,
the value of the parent path is moved to the aid path member and
file ID takes place of the path value.
; 'cd ..' command takes into account the parent can be presented by DF_NAME
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5391 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-23 06:32:53 +00:00
vtarasov
54f3e8c423
pkcs15init: little correction of r5386
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5390 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-22 14:02:45 +00:00
vtarasov
6b04ab7650
pkcs15init: in 'change-attribute' procedure use card specific 'update DF' handler ...
...
... when it's available.
'Change-attribute' is used by pkcs15 framework for PKCS#11.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5389 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-22 14:00:47 +00:00
vtarasov
4fa9679463
pkcs15init: use dedicated function to fix the EC parameters ...
...
; use pointQ data to calculate intrinsic ID for the EC keys/certs
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5388 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-22 13:50:01 +00:00
vtarasov
9376b73d14
EC support: new exported function to fill up the EC parameters data ...
...
for ex. with the given named curve fills the 'OID' and 'encoded OID' members
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5387 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-22 13:35:57 +00:00
vtarasov
78d90c4765
EC support: introduce data type dedicated to EC parameters ...
...
EC parameters can be presented in a three forms: namedCurve, OID and implicit data.
This new data type will facilitate manipulation of ec-parameters in the OpenSC tools and library.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5386 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-22 13:08:45 +00:00
vtarasov
3e9b88d6d6
pkcs15init iasecc: old syntax in the profile of the Oberthur's generic application
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5385 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 17:20:39 +00:00
vtarasov
7db9532f00
pkcs11 framework-pkcs15: add EC key generation mechanism
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5384 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 16:29:13 +00:00
vtarasov
e430fe9d87
pkcs11-tool: add test procedure for EC keys ...
...
... for a while it includes key generation and data signing.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5383 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 16:18:23 +00:00
vtarasov
9758bb28bf
pkcs11: copy&past issue in r5356
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5382 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 16:14:36 +00:00
vtarasov
c2a87ae2b1
pkcs11-tool: prepare 'gen_keypair' procedure to generate also the EC keys ...
...
... 'prime256v1' and 'secp384r1'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5381 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 14:29:51 +00:00
vtarasov
38103c64cf
pkcs15: new function to encode an OID in DER format
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5380 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 14:12:03 +00:00
vtarasov
669a10572a
asn1: now sc_der_copy() returns int value
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5379 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-21 13:46:28 +00:00
martin
df7d560c35
WindowsInstaller: Use OpenSC version information in Windows file version resource.
...
* Fix license information in file info (GPL->LGPL)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5378 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-20 14:53:07 +00:00
martin
9b4f1369c4
MacInstaller: fix 10.5 build script, broken with previous change.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5377 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-20 13:41:04 +00:00
martin
a7934b307e
MacInstaller: use autoconf to write the correct version to ReadMe files of installers.
...
* Better version tagging of generated files
* Bundle files necessary for OS X installer generation to the distribution targzip
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5376 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-20 12:14:44 +00:00
andre
094eb8697c
opensc-tool.c: Fixes literal names in 'const id2str_t alg_type_names[]'.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5375 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 13:45:30 +00:00
andre
9026ea6f3f
pkcs11-tool.c: Avoid warning:
...
pkcs11-tool.c:1978: warning: ‘getPUBLIC_EXPONENT’ defined but not used
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5374 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 13:03:49 +00:00
andre
ff7bb8fbf4
profile.c: Avoid warning:
...
profile.c:1212: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5373 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 12:59:23 +00:00
andre
fa8fd1602d
types.h: Avoid warning:
...
opensc-tool.c:356: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5372 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 12:34:16 +00:00
martin
f8665b4405
manpages: add a rudimentary manual page for eidenv command. Fixes #339
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5371 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 11:19:47 +00:00
martin
8f0ba374f3
Add reminders to bytes2apdu style code blocks.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5370 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:27 +00:00
martin
1932ce861f
opensc-{explorer,tool}: allow sending extended APDUs
...
In do_apdu() resp send_apdu/(, flexibilize parsing the APDU string passed
so that extended APDUs are accepted a valid APDUs too.
While at it, fix a bug where more data than available would have been copied,
potentially leading to a SIGSEGV.
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5369 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:22 +00:00
martin
9dc233163a
opensc-tool: convert print_file() to using tables
...
Use ID<->name tables in print_file() innstead of arrays of strings where
the index was treated like some "magic" constant. With the new mapping tables,
the meaning is obvious.
While on it, fix a bug with ac_ops_df[]: before the conversion, it was a list
of pointers to strings but was in one case treated like it was a mapping table.
With the conversion to a mapping table, and the adaption of other code parts
this bug got fixed "automagically" ;-)
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5368 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:16 +00:00
martin
be5456d3ca
opensc-tool: make list_algorithms() table driven
...
Use easily extensible tables instead of explicit coding to display
algorithm names and options in list_algorithms.
Leverage the new tables to add more RSA hashes.
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5367 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:11 +00:00
martin
e5a133d00c
Fix a crash on Windows, where pkcs15-tool -E would always crash in sc_pkcs15_free_card()
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5366 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:06 +00:00
martin
4f768fcdc5
WindowsInstaller: Fix warning CNDL1069 about deprecated attribute
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5365 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:01 +00:00
martin
404d84ae48
WindowsInstaller: Fix Wix warning:
...
Z:\opensc\win32\OpenSC.wxs(22) : warning CNDL1121 : Package/@InstallerVersion must be 200 or greater for a 64-bit package.
The value will be changed to 200. Please specify a value of 200 or greater in order to eliminate this warning.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5364 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:50:52 +00:00
andre
6409755bea
pkcs11-tool.c: Avoid warning:
...
pkcs11-tool.c:2000: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5363 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 09:18:12 +00:00
andre
261d5269e5
pkcs15-init.h: Avoid warning:
...
pkcs15-init.c:1473: warning: assignment discards qualifiers from pointer target type
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5362 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 09:12:17 +00:00
andre
90ffef6dc9
asn1.c: Check boundaries __before__ accessing memory.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5361 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 12:29:47 +00:00
martin
c0c0882a1e
WindowsInstaller: split the UpgradeCode for x86 and x64, so that both versions could be installed in parallel on x64
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5360 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 10:01:32 +00:00
martin
007d27feeb
Introduce sc_ctx_log_to_file to set the debug file of libopensc.
...
On Windows every DLL has their own file descriptor table, thus specifying
-v from any of the OpenSC tools resulted in a crash when the tool tried to override
ctx->debug_file with stderr.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5359 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 10:01:27 +00:00
martin
1c244f8644
WindowsInstaller: fix "parallel installs"
...
Before this change, installing a new MSI would create a new OpenSC entry in "Add/Remove programs".
Now correctly a single instance exists and a seamless upgrade can be done.
Make the URL-s for support information more specific and add the OpenSC icon to the programs list.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5358 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 09:29:15 +00:00
vtarasov
8de6b57882
pkcs15init: different possible kinds of EC generate key parameters ...
...
named curve, oid and der
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5357 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 18:48:12 +00:00
vtarasov
ef1726e782
pkcs11: process the EC key generation type
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5356 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 18:45:27 +00:00
vtarasov
caf3789439
asn1: in encode-object-id procedure do not stop on zero -- it's a valid value
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5355 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 18:39:01 +00:00
martin
4072b2bc0d
WindowsInstaller: fix x86 build after r5351
...
error CNDL0150 : Undefined preprocessor variable '$(var.PlatformProgramFilesFolder)'.
NMAKE : fatal error U1077: '"C:\Program Files\Windows Installer XML v3.6\bin\candle.exe"' : return code '0x96'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5354 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:58:09 +00:00
martin
b0c200c885
WindowsInstaller: Always use a canonical name for OpenSC related registry entries.
...
This fixes the 64bit build looking for registry keys under "OpenSC (64 bit)" which is the name of the package.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5353 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:12:03 +00:00
martin
15d6ecddc6
WindowsInstaller: One more fix for x64 installer: opensc.conf
...
c:\jenkins\workspace\OpenSC_win64_nightly\win32\OpenSC.wxs(61) : error LGHT0204 : ICE80: This 32BitComponent opensc.conf uses 64BitDirectory INSTALLDIR
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Windows Installer XML v3.6\bin\light.exe"' : return code '0xcc'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5352 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:18:11 +00:00
martin
5ccfeddf46
WindowsInstaller: Add win64 flag even to platform-independent files.
...
* Install to "System64Folder" on x64
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5351 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:05:47 +00:00
martin
82258b01f7
WindowsInstaller: fix typo, causing the x86 installer to claim to be x64
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5350 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 12:50:30 +00:00
vtarasov
2202614fdc
pkcs15init setcos: no need of card specific 'delete-object' callback ...
...
there is nothing specific inside and it's never called by pkcs15init
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5349 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 17:57:49 +00:00
vtarasov
28ccae7918
card-piv: store serial number into the 'serialnr' member of sc_card structure ...
...
... when serial number was asked for the first time.
Then return the stored value for the every next request of serial number.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5348 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 17:35:56 +00:00
martin
e2aac209d2
WindowsInstaller: amend r5345, Win64 is a property of a Component, not File
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5347 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:25:21 +00:00
martin
3e20fab565
Add back removed product name
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5346 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:14:56 +00:00
martin
af098605d7
WindowsInstaller: set Win64 flag for binaries when building for win64 and use the right program files folder.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5345 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:10:07 +00:00
vtarasov
d673e5f109
pkcs15init myEID: in profile increase size of xDF files, also ...
...
during initialization add the all xxDF to the ODF
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5344 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-15 17:11:38 +00:00
vtarasov
614e9fa566
pkcs15init: sipmlify the 'delete-object' callaback prototype ...
...
now it takes 'sc_pkcs15_object' argument instead of two arguments - object's type and object's data.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5343 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-15 16:50:04 +00:00
vtarasov
3aae1d39c2
framework-pkcs15: minor coding style issues
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5342 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-15 16:35:29 +00:00