diff options
| author | Werner Koch <wk@gnupg.org> | 2010-01-08 20:18:49 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-01-08 20:18:49 +0100 |
| commit | be45bf3d544873ff4bc86496c6ab6c5f16c6a26e (patch) | |
| tree | 31c443f6d989917ea476143abc4fd5d2ae749faa /scd | |
| parent | Fix bug 1146 (diff) | |
| download | gnupg2-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.tar.xz gnupg2-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.zip | |
Add dummu option --passwd for gpg.
Collected changes.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/app-p15.c | 2 | ||||
| -rw-r--r-- | scd/ccid-driver.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scd/app-p15.c b/scd/app-p15.c index 26fb29d98..f7c4cfee9 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2909,7 +2909,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo, if (aodf->pinflags.integrity_protected || aodf->pinflags.confidentiality_protected) { - log_error ("PIN verification requires unsupported protecion method\n"); + log_error ("PIN verification requires unsupported protection method\n"); return gpg_error (GPG_ERR_BAD_PIN_METHOD); } if (!aodf->stored_length && aodf->pinflags.needs_padding) 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"); |