summaryrefslogtreecommitdiffstats
path: root/scd/ccid-driver.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-01-08 20:18:49 +0100
committerWerner Koch <wk@gnupg.org>2010-01-08 20:18:49 +0100
commitbe45bf3d544873ff4bc86496c6ab6c5f16c6a26e (patch)
tree31c443f6d989917ea476143abc4fd5d2ae749faa /scd/ccid-driver.c
parentFix bug 1146 (diff)
downloadgnupg2-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.tar.xz
gnupg2-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.zip
Add dummu option --passwd for gpg.
Collected changes.
Diffstat (limited to 'scd/ccid-driver.c')
-rw-r--r--scd/ccid-driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 844058e0b..8c362d73c 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -845,11 +845,11 @@ parse_ccid_descriptor (ccid_driver_t handle,
if ((us & 0x0020))
DEBUGOUT (" Auto baud rate change\n");
if ((us & 0x0040))
- DEBUGOUT (" Auto parameter negotation made by CCID\n");
+ DEBUGOUT (" Auto parameter negotiation made by CCID\n");
else if ((us & 0x0080))
DEBUGOUT (" Auto PPS made by CCID\n");
else if ((us & (0x0040 | 0x0080)))
- DEBUGOUT (" WARNING: conflicting negotation features\n");
+ DEBUGOUT (" WARNING: conflicting negotiation features\n");
if ((us & 0x0100))
DEBUGOUT (" CCID can set ICC in clock stop mode\n");