Menu
▾
▴
[Opensc-commits] [OpenSC/OpenSC] 1789cf: OpenPGP: Detect and support Gnuk Token.
|
From: GitHub <no...@gi...> - 2015-09-13 20:45:47
|
Branch: refs/heads/master Home: https://github.com/OpenSC/OpenSC Commit: 1789cf034588e8cd7fc0334b515e14637c84563a https://github.com/OpenSC/OpenSC/commit/1789cf034588e8cd7fc0334b515e14637c84563a Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c M src/libopensc/cards.h M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Detect and support Gnuk Token. http://www.fsij.org/gnuk/ Commit: a4d92610878d4d13449c458a9fba5f885e769f70 https://github.com/OpenSC/OpenSC/commit/a4d92610878d4d13449c458a9fba5f885e769f70 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/pkcs15-openpgp.c M src/libopensc/pkcs15-syn.c Log Message: ----------- OpenPGP: Add Gnuk in pkcs15 emulation layer. Commit: c81eab5a70bb7aa71d0d69745015cee9deb74370 https://github.com/OpenSC/OpenSC/commit/c81eab5a70bb7aa71d0d69745015cee9deb74370 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Include private DO to filesystem at driver initialization. In old implementation, the DOs which their access is restricted by PIN (like DOs 0101 -> 0104) were excluded from the fake filesystem, leading to that we cannot read their data later, even if we verified PIN. Commit: 24e3bdb87280275fe91a176d2e1c012f516bf4fd https://github.com/OpenSC/OpenSC/commit/24e3bdb87280275fe91a176d2e1c012f516bf4fd Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/pkcs15-openpgp.c Log Message: ----------- PKCS15-OpenPGP: Declare DATA objects. Begin to support read/write DATA object for PKCS-OpenPGP binding. This object is used by TrueCrypt. Commit: 3b8f77882b7ddca14d5da1404d1b8c13dc476757 https://github.com/OpenSC/OpenSC/commit/3b8f77882b7ddca14d5da1404d1b8c13dc476757 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Support erasing (reset) card. Command: openpgp-tool --erase Commit: c4bbfa67593c61d9a820b1b9bcd76c2cffe0d09e https://github.com/OpenSC/OpenSC/commit/c4bbfa67593c61d9a820b1b9bcd76c2cffe0d09e Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/tools/openpgp-tool.c Log Message: ----------- openpgp-tool: Support deleting key in Gnuk. Commit: db39041cc1596245c8d35ab07b440513c280e748 https://github.com/OpenSC/OpenSC/commit/db39041cc1596245c8d35ab07b440513c280e748 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Correct building Extended Header List when importing keys. Commit: 1df3daeb62942f5b1ee0e683465790348905bb21 https://github.com/OpenSC/OpenSC/commit/1df3daeb62942f5b1ee0e683465790348905bb21 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Read some empty DOs from Gnuk. In Gnuk, some empty DOs are returned as not exist, instead of existing with empty value. So, we will consider them exist in driver. Commit: 6a55c09793fb185cc617cb2812d385d1c87c35de https://github.com/OpenSC/OpenSC/commit/6a55c09793fb185cc617cb2812d385d1c87c35de Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/pkcs15-openpgp.c Log Message: ----------- PKCS15-OpenPGP: Do not show empty DO in pkcs15 emu_init. Commit: 9a2a6e6dc0f55679e8c0e918802af76c41d07a31 https://github.com/OpenSC/OpenSC/commit/9a2a6e6dc0f55679e8c0e918802af76c41d07a31 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/pkcs15-openpgp.c M src/pkcs15init/pkcs15-openpgp.c Log Message: ----------- PKCS15-OpenPGP: Allow to store data to pkcs15 data object. Only one DO is supported now. Commit: ebbebb4fa67d2f0d5b2ec549ff9b2efd568fd1b0 https://github.com/OpenSC/OpenSC/commit/ebbebb4fa67d2f0d5b2ec549ff9b2efd568fd1b0 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Provide enough buffer to read pubkey from Gnuk. Commit: cbc53b9a97e96dddfd6339a8ebddb87c472efb7e https://github.com/OpenSC/OpenSC/commit/cbc53b9a97e96dddfd6339a8ebddb87c472efb7e Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Support write certificate for Gnuk. Commit: bbca9c4827bd164f8b3e5a5d8966d990b6a68b75 https://github.com/OpenSC/OpenSC/commit/bbca9c4827bd164f8b3e5a5d8966d990b6a68b75 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/pkcs15init/pkcs15-openpgp.c Log Message: ----------- pkcs15-openpgp: Change to sc_put_data instead of sc_update_binary when writing certificate. Commit: e71906ed23f436b49f78942363ce060f9260172b https://github.com/OpenSC/OpenSC/commit/e71906ed23f436b49f78942363ce060f9260172b Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Overcome the restriction of even data length of Gnuk. When write certificate with odd length to Gnuk, we add zero padding to make it even. Commit: a1c8c99858b49cc1597c8737d5717ccbf1c8b5df https://github.com/OpenSC/OpenSC/commit/a1c8c99858b49cc1597c8737d5717ccbf1c8b5df Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Delete key as file, for Gnuk. Commit: a42eb5e5854ec92b2f2cba0a3e0fc82d7cfc3060 https://github.com/OpenSC/OpenSC/commit/a42eb5e5854ec92b2f2cba0a3e0fc82d7cfc3060 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Correct parameter checking. Commit: 7ba89893da4bcd743030ddbea425d18d186a6b8a https://github.com/OpenSC/OpenSC/commit/7ba89893da4bcd743030ddbea425d18d186a6b8a Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Make code neater Commit: 6aa4896b358bde7a17e6d68c37d4b61c5a11d465 https://github.com/OpenSC/OpenSC/commit/6aa4896b358bde7a17e6d68c37d4b61c5a11d465 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- Move declaration to top of block. Commit: 7c27cea61ff1ef4a8d036af2b8a8b2abb889bdc8 https://github.com/OpenSC/OpenSC/commit/7c27cea61ff1ef4a8d036af2b8a8b2abb889bdc8 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Make indentation consistent (space -> tab). Commit: ba4fe34700a92f9bc89b09227f8883d473cadea3 https://github.com/OpenSC/OpenSC/commit/ba4fe34700a92f9bc89b09227f8883d473cadea3 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Don't use sc_log in openpgp-tool. Commit: 968c9bb06140d081838737cf48df49badbe7790f https://github.com/OpenSC/OpenSC/commit/968c9bb06140d081838737cf48df49badbe7790f Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Don't reimplement gnuk_delete_key in openpgp-tool. Commit: aded490b649bec1e4f31d8a84d3d36ab89db7b27 https://github.com/OpenSC/OpenSC/commit/aded490b649bec1e4f31d8a84d3d36ab89db7b27 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Use directly binary array of APDUs for ERASE command. I used a string presentation before and it needed an extra conversion step. Commit: c71934af67c2978e1f14b5dc822235fa80a83796 https://github.com/OpenSC/OpenSC/commit/c71934af67c2978e1f14b5dc822235fa80a83796 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Rename private "blob" type to avoid confusing with variable name. This name has been used for both data type and variable name of that type. Commit: 7c9bc4d283a353791bd4c23e16e6bcddbb8a6fc5 https://github.com/OpenSC/OpenSC/commit/7c9bc4d283a353791bd4c23e16e6bcddbb8a6fc5 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-07-14 (Mon, 14 Jul 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- OpenPGP: Fix crash after accessing inexistent file. Commit: 901c7952c1d833860f488b0dd2e2382662198ec9 https://github.com/OpenSC/OpenSC/commit/901c7952c1d833860f488b0dd2e2382662198ec9 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-11-09 (Sun, 09 Nov 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- Replace hardcode. Commit: 8d21cea7fcea9960f52fa9e0f7893435f01521a4 https://github.com/OpenSC/OpenSC/commit/8d21cea7fcea9960f52fa9e0f7893435f01521a4 Author: george <ggk...@ya...> Date: 2014-11-11 (Tue, 11 Nov 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- hardcode->defines for DO's Commit: 4ab317ad2f2883ed78b7d95f206d308a0b2489fc https://github.com/OpenSC/OpenSC/commit/4ab317ad2f2883ed78b7d95f206d308a0b2489fc Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- Merge pull request #3 from Nitrokey/gnuk hardcode->defines for DO's Commit: 7f089832407d7e5dcc22a75e383065fccf9a0d36 https://github.com/OpenSC/OpenSC/commit/7f089832407d7e5dcc22a75e383065fccf9a0d36 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-12-09 (Tue, 09 Dec 2014) Changed paths: M .gitignore M MacOSX/build-package.in M configure.ac M doc/tools/Makefile.am A doc/tools/completion-template A doc/tools/dnie-tool.1.xml R doc/tools/dnie-tool.xml M doc/tools/openpgp-tool.1.xml M doc/tools/pkcs11-tool.1.xml M doc/tools/pkcs15-init.1.xml M doc/tools/sc-hsm-tool.1.xml M doc/tools/westcos-tool.1.xml M src/libopensc/card-asepcos.c M src/libopensc/card-authentic.c M src/libopensc/card-belpic.c M src/libopensc/card-cardos.c M src/libopensc/card-dnie.c M src/libopensc/card-epass2003.c M src/libopensc/card-flex.c M src/libopensc/card-gpk.c M src/libopensc/card-mcrd.c M src/libopensc/card-oberthur.c M src/libopensc/card-piv.c M src/libopensc/card-sc-hsm.c M src/libopensc/card-setcos.c M src/libopensc/ctbcs.c M src/libopensc/cwa14890.c M src/libopensc/iso7816.c M src/libopensc/libopensc.exports M src/libopensc/muscle.c M src/libopensc/opensc.h M src/libopensc/p15card-helper.c M src/libopensc/pkcs15-atrust-acos.c M src/libopensc/pkcs15-dnie.c M src/libopensc/pkcs15-gemsafeV1.c M src/libopensc/pkcs15-pubkey.c M src/libopensc/pkcs15-sc-hsm.c M src/libopensc/pkcs15-skey.c M src/libopensc/pkcs15-syn.c M src/libopensc/pkcs15.h M src/libopensc/reader-ctapi.c M src/libopensc/sc.c M src/libopensc/sm.h M src/libopensc/types.h M src/pkcs11/framework-pkcs15.c M src/pkcs11/framework-pkcs15init.c M src/pkcs11/pkcs11-object.c M src/pkcs15init/pkcs15-asepcos.c M src/pkcs15init/pkcs15-cardos.c M src/pkcs15init/pkcs15-jcop.c M src/pkcs15init/pkcs15-lib.c M src/pkcs15init/pkcs15-oberthur.c M src/pkcs15init/pkcs15-sc-hsm.c M src/scconf/parse.c M src/scconf/sclex.c M src/smm/sm-card-authentic.c M src/smm/sm-card-iasecc.c M src/smm/sm-cwa14890.c M src/smm/sm-global-platform.c M src/tests/sc-test.c M src/tools/cardos-tool.c M src/tools/dnie-tool.c M src/tools/openpgp-tool.c M src/tools/pkcs11-tool.c M src/tools/pkcs15-init.c M src/tools/pkcs15-tool.c M src/tools/sc-hsm-tool.c M src/tools/util.c M src/tools/util.h M src/tools/westcos-tool.c M win32/OpenSC.wxs.in Log Message: ----------- Merge branch 'master' into gnuk Conflicts: src/tools/openpgp-tool.c Commit: 99b5cb53e1da2f0d7692f28dceff8485d4b74daf https://github.com/OpenSC/OpenSC/commit/99b5cb53e1da2f0d7692f28dceff8485d4b74daf Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-12-10 (Wed, 10 Dec 2014) Changed paths: M src/libopensc/card-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- OpenPGP: Remove unused variables and fix type cast. Commit: c71a453ff1e19721a9245b8a2d637eabd9f12e54 https://github.com/OpenSC/OpenSC/commit/c71a453ff1e19721a9245b8a2d637eabd9f12e54 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2014-12-11 (Thu, 11 Dec 2014) Changed paths: M src/tools/openpgp-tool.c Log Message: ----------- openpgp-tool: Fix wrong operator Used "!=" instead of "|=" Commit: d0e3d1be3d7c7ca2036acf11e31d832a6f892995 https://github.com/OpenSC/OpenSC/commit/d0e3d1be3d7c7ca2036acf11e31d832a6f892995 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2015-07-04 (Sat, 04 Jul 2015) Changed paths: M src/libopensc/card-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- Fix tab & spaces Commit: 6409202c2f7a3153b1a92a3533bc5bc8cd8b6863 https://github.com/OpenSC/OpenSC/commit/6409202c2f7a3153b1a92a3533bc5bc8cd8b6863 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2015-08-08 (Sat, 08 Aug 2015) Changed paths: M src/libopensc/card-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- [OpenPGP] Fix warnings about type conversion. Commit: 70890a8f61187f15baeb4c412aa38d151ee312a5 https://github.com/OpenSC/OpenSC/commit/70890a8f61187f15baeb4c412aa38d151ee312a5 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M .gitignore A .travis.yml A CONTRIBUTING.md M MacOSX/build-package.in M MacOSX/opensc-uninstall M NEWS A README.md M configure.ac M doc/tools/Makefile.am M doc/tools/dnie-tool.1.xml M doc/tools/opensc-explorer.1.xml M doc/tools/pkcs11-tool.1.xml M doc/tools/pkcs15-crypt.1.xml M doc/tools/pkcs15-tool.1.xml M etc/Makefile.am M etc/opensc.conf.in M etc/opensc.conf.win.in M src/common/compat_getopt.c M src/common/compat_getopt_main.c M src/common/compat_getpass.c M src/common/compat_strlcat.c M src/common/compat_strlcpy.c M src/common/libpkcs11.c M src/common/libscdl.c M src/libopensc/Makefile.am M src/libopensc/Makefile.mak M src/libopensc/apdu.c M src/libopensc/asn1.c M src/libopensc/asn1.h M src/libopensc/base64.c M src/libopensc/card-acos5.c M src/libopensc/card-akis.c M src/libopensc/card-asepcos.c M src/libopensc/card-atrust-acos.c M src/libopensc/card-authentic.c M src/libopensc/card-belpic.c M src/libopensc/card-cardos.c M src/libopensc/card-default.c M src/libopensc/card-dnie.c M src/libopensc/card-entersafe.c M src/libopensc/card-epass2003.c M src/libopensc/card-flex.c M src/libopensc/card-gemsafeV1.c M src/libopensc/card-gpk.c M src/libopensc/card-ias.c M src/libopensc/card-iasecc.c M src/libopensc/card-incrypto34.c A src/libopensc/card-isoApplet.c M src/libopensc/card-itacns.c M src/libopensc/card-jcop.c A src/libopensc/card-masktech.c M src/libopensc/card-mcrd.c M src/libopensc/card-miocos.c M src/libopensc/card-muscle.c M src/libopensc/card-myeid.c M src/libopensc/card-oberthur.c M src/libopensc/card-openpgp.c M src/libopensc/card-piv.c M src/libopensc/card-rtecp.c M src/libopensc/card-rutoken.c M src/libopensc/card-sc-hsm.c M src/libopensc/card-setcos.c M src/libopensc/card-starcos.c M src/libopensc/card-tcos.c M src/libopensc/card-westcos.c M src/libopensc/card.c M src/libopensc/cardctl.h M src/libopensc/cards.h M src/libopensc/compression.c M src/libopensc/ctbcs.c M src/libopensc/ctx.c M src/libopensc/cwa-dnie.c M src/libopensc/cwa14890.c M src/libopensc/cwa14890.h M src/libopensc/dir.c M src/libopensc/errors.c M src/libopensc/iasecc-sdo.c M src/libopensc/iasecc-sm.c M src/libopensc/internal-winscard.h M src/libopensc/internal.h M src/libopensc/iso7816.c M src/libopensc/libopensc.exports M src/libopensc/log.c M src/libopensc/log.h M src/libopensc/muscle-filesystem.c M src/libopensc/muscle.c M src/libopensc/opensc.h M src/libopensc/p15card-helper.c M src/libopensc/padding.c M src/libopensc/pkcs15-actalis.c M src/libopensc/pkcs15-algo.c M src/libopensc/pkcs15-atrust-acos.c M src/libopensc/pkcs15-cache.c M src/libopensc/pkcs15-cert.c M src/libopensc/pkcs15-data.c M src/libopensc/pkcs15-dnie.c M src/libopensc/pkcs15-esinit.c M src/libopensc/pkcs15-esteid.c M src/libopensc/pkcs15-gemsafeGPK.c M src/libopensc/pkcs15-gemsafeV1.c M src/libopensc/pkcs15-infocamere.c M src/libopensc/pkcs15-itacns.c M src/libopensc/pkcs15-oberthur.c M src/libopensc/pkcs15-openpgp.c M src/libopensc/pkcs15-pin.c M src/libopensc/pkcs15-piv.c M src/libopensc/pkcs15-postecert.c M src/libopensc/pkcs15-prkey.c M src/libopensc/pkcs15-pteid.c M src/libopensc/pkcs15-pubkey.c M src/libopensc/pkcs15-sc-hsm.c M src/libopensc/pkcs15-sec.c M src/libopensc/pkcs15-starcert.c M src/libopensc/pkcs15-syn.c M src/libopensc/pkcs15-tccardos.c M src/libopensc/pkcs15-tcos.c M src/libopensc/pkcs15-westcos.c M src/libopensc/pkcs15.c M src/libopensc/pkcs15.h M src/libopensc/reader-ctapi.c M src/libopensc/reader-openct.c M src/libopensc/reader-pcsc.c M src/libopensc/sc.c M src/libopensc/sec.c M src/libopensc/sm.c M src/libopensc/sm.h M src/libopensc/types.h M src/libopensc/user-interface.c M src/libsm/sm-common.c A src/minidriver/minidriver-italian-cns.reg M src/minidriver/minidriver.c M src/minidriver/versioninfo-minidriver.rc.in M src/pkcs11/framework-pkcs15.c M src/pkcs11/framework-pkcs15init.c M src/pkcs11/mechanism.c M src/pkcs11/misc.c M src/pkcs11/openssl.c M src/pkcs11/pkcs11-display.c M src/pkcs11/pkcs11-display.h M src/pkcs11/pkcs11-global.c M src/pkcs11/pkcs11-object.c M src/pkcs11/pkcs11-session.c M src/pkcs11/pkcs11-spy.c M src/pkcs11/pkcs11.h M src/pkcs11/sc-pkcs11.h M src/pkcs11/slot.c M src/pkcs15init/Makefile.am M src/pkcs15init/Makefile.mak A src/pkcs15init/isoApplet.profile M src/pkcs15init/pkcs15-asepcos.c M src/pkcs15init/pkcs15-authentic.c M src/pkcs15init/pkcs15-cardos.c M src/pkcs15init/pkcs15-cflex.c M src/pkcs15init/pkcs15-entersafe.c M src/pkcs15init/pkcs15-epass2003.c M src/pkcs15init/pkcs15-gpk.c M src/pkcs15init/pkcs15-iasecc.c M src/pkcs15init/pkcs15-init.h A src/pkcs15init/pkcs15-isoApplet.c M src/pkcs15init/pkcs15-jcop.c M src/pkcs15init/pkcs15-lib.c M src/pkcs15init/pkcs15-muscle.c M src/pkcs15init/pkcs15-myeid.c M src/pkcs15init/pkcs15-oberthur-awp.c M src/pkcs15init/pkcs15-oberthur.c M src/pkcs15init/pkcs15-openpgp.c M src/pkcs15init/pkcs15-rtecp.c M src/pkcs15init/pkcs15-sc-hsm.c M src/pkcs15init/pkcs15-setcos.c M src/pkcs15init/pkcs15-westcos.c M src/pkcs15init/profile.c M src/scconf/parse.c M src/scconf/sclex.c M src/smm/sm-card-iasecc.c M src/smm/sm-cwa14890.c M src/tests/base64.c M src/tests/lottery.c M src/tests/p15dump.c M src/tests/pintest.c M src/tests/regression/crypt0007 M src/tests/regression/functions M src/tools/cardos-tool.c M src/tools/cryptoflex-tool.c M src/tools/dnie-tool.c M src/tools/openpgp-tool.c M src/tools/opensc-explorer.c M src/tools/opensc-tool.c M src/tools/piv-tool.c M src/tools/pkcs11-tool.c M src/tools/pkcs15-crypt.c M src/tools/pkcs15-init.c M src/tools/pkcs15-tool.c M src/tools/sc-hsm-tool.c M src/tools/util.c M src/tools/westcos-tool.c M win32/Make.rules.mak M win32/Makefile.am M win32/Makefile.mak M win32/OpenSC.wxs.in A win32/bannrbmp.bmp A win32/customactions.cpp A win32/customactions.exports A win32/dlgbmp.bmp A win32/versioninfo-customactions.rc.in M win32/winconfig.h.in Log Message: ----------- Merge branch 'master' into gnuk Conflicts: src/libopensc/card-openpgp.c src/tools/openpgp-tool.c Commit: a64bbc55aa88211ce391e32bf1c2fa06c62cc6d6 https://github.com/OpenSC/OpenSC/commit/a64bbc55aa88211ce391e32bf1c2fa06c62cc6d6 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M src/libopensc/card-openpgp.c Log Message: ----------- [OpenPGP] Fix building without OpenSSL. Commit: 76b6b483c74499018b2a5b0661208b6d18c0e1b6 https://github.com/OpenSC/OpenSC/commit/76b6b483c74499018b2a5b0661208b6d18c0e1b6 Author: Nguyễn Hồng Quân <ng....@gm...> Date: 2015-09-13 (Sun, 13 Sep 2015) Changed paths: M MacOSX/build-package.in M README.md A appveyor.yml M doc/tools/pkcs15-tool.1.xml M etc/opensc.conf.in M src/common/libscdl.c M src/libopensc/apdu.c M src/libopensc/card-dnie.c M src/libopensc/card-masktech.c M src/libopensc/card-myeid.c M src/libopensc/card-piv.c M src/libopensc/card-sc-hsm.c M src/libopensc/card-sc-hsm.h M src/libopensc/card.c M src/libopensc/ctx.c M src/libopensc/internal-winscard.h M src/libopensc/iso7816.c M src/libopensc/opensc.h M src/libopensc/pkcs15.c M src/libopensc/reader-pcsc.c M src/pkcs11/Makefile.am M src/pkcs11/Makefile.mak R src/pkcs11/opensc-pkcs11.exports R src/pkcs11/pkcs11-spy.exports A src/pkcs11/pkcs11.exports M src/tools/pkcs15-tool.c M src/tools/sc-hsm-tool.c M win32/customactions.cpp Log Message: ----------- Merge branch 'master' into gnuk Commit: 89be9d6e1857299f0d60f97c1d6847d874dae6d7 https://github.com/OpenSC/OpenSC/commit/89be9d6e1857299f0d60f97c1d6847d874dae6d7 Author: Frank Morgner <mo...@in...> Date: 2015-09-13 (Sun, 13 Sep 2015) Changed paths: M src/libopensc/card-openpgp.c M src/libopensc/cards.h M src/libopensc/pkcs15-openpgp.c M src/libopensc/pkcs15-syn.c M src/pkcs15init/pkcs15-openpgp.c M src/tools/openpgp-tool.c Log Message: ----------- Merge pull request #303 from hongquan/gnuk Gnuk support Compare: https://github.com/OpenSC/OpenSC/compare/a906c6d7b82e...89be9d6e1857 |
