[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] e2fd21: libcacard: correct T0 historical byte
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] e2fd21: libcacard: correct T0 historical bytes size |
Date: |
Wed, 24 Apr 2013 12:30:13 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: e2fd2115ce26049335d66ae0ae5e5c0ad06fb498
https://github.com/qemu/qemu/commit/e2fd2115ce26049335d66ae0ae5e5c0ad06fb498
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vcardt.h
Log Message:
-----------
libcacard: correct T0 historical bytes size
The VCARD_ATR_PREFIX macro adds a prefix of 6 characters only.
pcsc_scan was complaining before the patch:
+ Historical bytes: 56 43 41 52 44 5F 4E 53 53
ERROR! ATR is truncated: 2 byte(s) is/are missing
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: d0ebd78890fba2ab458ec34763dae8566ccb1b72
https://github.com/qemu/qemu/commit/d0ebd78890fba2ab458ec34763dae8566ccb1b72
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/ccid-card-emulated.c
Log Message:
-----------
ccid-card-emul: do not crash if backend is not provided
Program received signal SIGSEGV, Segmentation fault.
__strcmp_sse42 () at ../sysdeps/x86_64/multiarch/strcmp-sse42.S:164
164 movdqu (%rsi), %xmm2
(gdb) bt
at /home/elmarco/320g/src/qemu/hw/ccid-card-emulated.c:477
at /home/elmarco/320g/src/qemu/hw/ccid-card-emulated.c:503
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: d18c7117467aa5fae95a7c6eaffcf50618197e79
https://github.com/qemu/qemu/commit/d18c7117467aa5fae95a7c6eaffcf50618197e79
Author: Jim Meyering <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/ccid-card-emulated.c
Log Message:
-----------
ccid: make backend_enum_table "static const" and adjust users
Signed-off-by: Jim Meyering <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: da000a4867749434e03896a5072321771736352a
https://github.com/qemu/qemu/commit/da000a4867749434e03896a5072321771736352a
Author: Jim Meyering <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/ccid-card-passthru.c
Log Message:
-----------
ccid: declare DEFAULT_ATR table to be "static const"
Signed-off-by: Jim Meyering <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: e2d9c5e769d59f2bca649b8286892d49bdcfc2b1
https://github.com/qemu/qemu/commit/e2d9c5e769d59f2bca649b8286892d49bdcfc2b1
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vcard_emul_nss.c
Log Message:
-----------
libcacard: use system config directory for nss db on win32
It's a bit nicer to look for default database under
CSIDL_COMMON_APPDATA\pki\nss rather that /etc/pki/nss.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: d3bf825e59125bc6a0accec0dca119ea0155cb82
https://github.com/qemu/qemu/commit/d3bf825e59125bc6a0accec0dca119ea0155cb82
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M util/osdep.c
M util/qemu-sockets.c
Log Message:
-----------
util: move socket_init() to osdep.c
vscclient needs to call socket_init() for portability.
Moving to osdep.c since it has no internal dependency.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: 37746c5eacf309fa019ea0fa45f776c36c561457
https://github.com/qemu/qemu/commit/37746c5eacf309fa019ea0fa45f776c36c561457
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M configure
M rules.mak
Log Message:
-----------
build-sys: must link with -fstack-protector
It is needed to give that flag to the linker as well, but latest
libtool 2.4.2 still swallows that argument, so let's pass it with
libtool -Wc argument.
qemu-1.4.0/stubs/arch-query-cpu-def.c:6: undefined reference to
`__stack_chk_guard'
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: 5354e4d242175e067bb70732f694ae9322a81351
https://github.com/qemu/qemu/commit/5354e4d242175e067bb70732f694ae9322a81351
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M Makefile
M rules.mak
Log Message:
-----------
libcacard: fix mingw64 cross-compilation
Compile and link with version.lo
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: a50b831ae1fe039b7c22793f307e0b8afdf50589
https://github.com/qemu/qemu/commit/a50b831ae1fe039b7c22793f307e0b8afdf50589
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vscclient.c
Log Message:
-----------
libcacard: split vscclient main() from socket reading
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: 930c8ad472ec00d40cfbf1e9b1395946bf0dd392
https://github.com/qemu/qemu/commit/930c8ad472ec00d40cfbf1e9b1395946bf0dd392
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vscclient.c
Log Message:
-----------
libcacard: vscclient to use QemuThread for portability
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: c9495ee9eb57786f5a60d4591bb186b23f6b6bef
https://github.com/qemu/qemu/commit/c9495ee9eb57786f5a60d4591bb186b23f6b6bef
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vscclient.c
Log Message:
-----------
libcacard: teach vscclient to use GMainLoop for portability
This version handles non-blocking sending and receiving from the
socket.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: 667e0b4b6806d53e0b46e29a15d24427ef958c78
https://github.com/qemu/qemu/commit/667e0b4b6806d53e0b46e29a15d24427ef958c78
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vcard_emul_nss.c
Log Message:
-----------
libcacard: remove sql: prefix
For some reason, with sql:/ prefix, the PKCS11 modules are not loaded.
This patch goes on top of Alon smartcard series.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: ad2181f2b612cd8bf0a790faa2a1b51559f7234b
https://github.com/qemu/qemu/commit/ad2181f2b612cd8bf0a790faa2a1b51559f7234b
Author: Marc-André Lureau <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vcard_emul_nss.c
Log Message:
-----------
libcacard: remove default libcoolkey loading
Use only the modules defined in the NSS database.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
Commit: 4543d43c6181d90f86fb528430f250810dde03d5
https://github.com/qemu/qemu/commit/4543d43c6181d90f86fb528430f250810dde03d5
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: white space fixes
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 7e1ac5abe3fbbfee4ddfc2d9971a644bd787e055
https://github.com/qemu/qemu/commit/7e1ac5abe3fbbfee4ddfc2d9971a644bd787e055
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: nicer debug messages
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 47bf53af7507986fc473cb308324340448fd85e7
https://github.com/qemu/qemu/commit/47bf53af7507986fc473cb308324340448fd85e7
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: remove aborts (never triggered, but just in case)
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: c5cd7c875608911ec74817d24cd12b825014ba19
https://github.com/qemu/qemu/commit/c5cd7c875608911ec74817d24cd12b825014ba19
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: support windows guest
By not advertising USB wakeup support (which we don't).
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 693e47738d05463b2743b0a652412d33cf254977
https://github.com/qemu/qemu/commit/693e47738d05463b2743b0a652412d33cf254977
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: reuse usb.h definitions
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: a26dfd95d33d650f9f9f93b6ee6f03be925db1a8
https://github.com/qemu/qemu/commit/a26dfd95d33d650f9f9f93b6ee6f03be925db1a8
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/vcardt.h
Log Message:
-----------
libcacard: change default ATR
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 0e61400c1941aabc9f45d5ff961b57337c7caac6
https://github.com/qemu/qemu/commit/0e61400c1941aabc9f45d5ff961b57337c7caac6
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/ccid-card-passthru.c
Log Message:
-----------
ccid-card-passthru: add atr check
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: b16352acf3105000e14f194b556e159d5d06cff9
https://github.com/qemu/qemu/commit/b16352acf3105000e14f194b556e159d5d06cff9
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/ccid-card-passthru.c
M hw/usb/dev-smartcard-reader.c
M include/qemu-common.h
M util/cutils.c
Log Message:
-----------
ccid-card-passthru, dev-smartcard-reader: add debug environment variables
Introduces a new utility function: parse_debug_env to avoid code
duplication.
This overrides whatever debug value is set on the corresponding devices
from the command line, and is meant to ease the usage with any
management stack. For libvirt you can set environment variables by
extending the dom namespace, i.e:
<domain type='kvm' id='3'
xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
<qemu:commandline>
<qemu:env name='QEMU_CCID_PASSTHRU_DEBUG' value='4'/>
<qemu:env name='QEMU_CCID_DEBUG' value='4'/>
</qemu:commandline>
</domain>
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 4942d6c39477f441a106430ab11f85806b4532f5
https://github.com/qemu/qemu/commit/4942d6c39477f441a106430ab11f85806b4532f5
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: define structs for CCID_Parameter internals
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: d7d218ef02d87c637d20d64da8f575d434ff6f78
https://github.com/qemu/qemu/commit/d7d218ef02d87c637d20d64da8f575d434ff6f78
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: change default protocol to T=0
We don't support T=1 so we shouldn't advertise it by default.
Two independent changes:
* Default ATR
sets T=0. This gets overwritten by the client provided ATR later.
* Class descriptor
changes dwAdvertise dwProtocols.PPPP to 0x1 and dwProtocols.RRRR=0 per spec.
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 2f8f916b6d4482976bb5cf179f65aa2cfcd1aec9
https://github.com/qemu/qemu/commit/2f8f916b6d4482976bb5cf179f65aa2cfcd1aec9
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: copy atr protocol to ccid parameters
Adds todos.
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 7a6858962457c54be44715d6562504c765d9ea76
https://github.com/qemu/qemu/commit/7a6858962457c54be44715d6562504c765d9ea76
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/cac.c
M libcacard/cac.h
M libcacard/vreader.c
Log Message:
-----------
libcacard/vreader: add debugging messages for apdu
Using g_debug with log domain libcacard
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 0b6a16c1a47b622b1a692ab179013d9e30e9cf3b
https://github.com/qemu/qemu/commit/0b6a16c1a47b622b1a692ab179013d9e30e9cf3b
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M Makefile.objs
M libcacard/vcard_emul_nss.c
A libcacard/vcardt.c
M libcacard/vcardt.h
A libcacard/vcardt_internal.h
Log Message:
-----------
libcacard: move atr setting from macro to function
Only because qemu's checkpatch complains about it.
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 58aeda15abb963196faaa4a0f23c5af45840f1b0
https://github.com/qemu/qemu/commit/58aeda15abb963196faaa4a0f23c5af45840f1b0
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/usb/dev-smartcard-reader.c
Log Message:
-----------
dev-smartcard-reader: empty implementation for Mechanical (fail correctly)
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 57f97834efe0c208ffadc9d2959f3d3d55580e52
https://github.com/qemu/qemu/commit/57f97834efe0c208ffadc9d2959f3d3d55580e52
Author: Alon Levy <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M libcacard/cac.c
Log Message:
-----------
libcacard/cac: change big switch functions to single return point
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: 1bfffe21a686ab273abce5ef12e8d2a3de320023
https://github.com/qemu/qemu/commit/1bfffe21a686ab273abce5ef12e8d2a3de320023
Author: Anthony Liguori <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M Makefile
M Makefile.objs
M configure
M hw/usb/ccid-card-emulated.c
M hw/usb/ccid-card-passthru.c
M hw/usb/dev-smartcard-reader.c
M include/qemu-common.h
M libcacard/cac.c
M libcacard/cac.h
M libcacard/vcard_emul_nss.c
A libcacard/vcardt.c
M libcacard/vcardt.h
A libcacard/vcardt_internal.h
M libcacard/vreader.c
M libcacard/vscclient.c
M rules.mak
M util/cutils.c
M util/osdep.c
M util/qemu-sockets.c
Log Message:
-----------
Merge remote-tracking branch 'alon/libcacard_ccid.1' into staging
# By Alon Levy (15) and others
# Via Alon Levy
* alon/libcacard_ccid.1: (28 commits)
libcacard/cac: change big switch functions to single return point
dev-smartcard-reader: empty implementation for Mechanical (fail correctly)
libcacard: move atr setting from macro to function
libcacard/vreader: add debugging messages for apdu
dev-smartcard-reader: copy atr protocol to ccid parameters
dev-smartcard-reader: change default protocol to T=0
dev-smartcard-reader: define structs for CCID_Parameter internals
ccid-card-passthru, dev-smartcard-reader: add debug environment variables
ccid-card-passthru: add atr check
libcacard: change default ATR
dev-smartcard-reader: reuse usb.h definitions
dev-smartcard-reader: support windows guest
dev-smartcard-reader: remove aborts (never triggered, but just in case)
dev-smartcard-reader: nicer debug messages
dev-smartcard-reader: white space fixes
libcacard: remove default libcoolkey loading
libcacard: remove sql: prefix
libcacard: teach vscclient to use GMainLoop for portability
libcacard: vscclient to use QemuThread for portability
libcacard: split vscclient main() from socket reading
...
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
Commit: 36afbc5135062ccd7d0166ffc3ddbca052d05c71
https://github.com/qemu/qemu/commit/36afbc5135062ccd7d0166ffc3ddbca052d05c71
Author: Markus Armbruster <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/i386/pc_piix.c
Log Message:
-----------
pc: Inline pc_init_pci_1_3() into pc_init_pci_1_2()
Just to make the commit after next easier to review.
Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
Commit: 6fd028f64f662c801fd5a54d0e3a1d2baeee93ea
https://github.com/qemu/qemu/commit/6fd028f64f662c801fd5a54d0e3a1d2baeee93ea
Author: Markus Armbruster <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/i386/pc_piix.c
Log Message:
-----------
pc: Split pc_init_pci_1_0() off pc_init_pci_1_2()
Just to make the next commit easier to review.
Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
Commit: 9953f8822cc316eec9962f0a2858c3439a80adec
https://github.com/qemu/qemu/commit/9953f8822cc316eec9962f0a2858c3439a80adec
Author: Markus Armbruster <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M hw/block/pc_sysfw.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M include/hw/i386/pc.h
Log Message:
-----------
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
Compare: https://github.com/qemu/qemu/compare/f3aa844bbb29...9953f8822cc3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] e2fd21: libcacard: correct T0 historical bytes size,
GitHub <=