Merge branch 'master' into key-storage-work
Unpublished Commit · Learn More
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description
Description
Details
Details
- Provenance
• werner Authored on Feb 12 2013, 7:17 PM - Parents
- rGb90506ea2208: gpg: Implement card_store_subkey again.
rGb11f84b858ba: kbx: Switch from MD5 to SHA-1 for the checksum. - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Werner Koch <wk@gnupg.org> committed rGcaddeef4a7ff: Merge branch 'master' into key-storage-work (authored by Werner Koch <wk@gnupg.org>).Feb 12 2013, 7:17 PM2013-02-12 19:17:42 (UTC+1)
Merged Changes
Merged Changes
- b90506ea2208 gpg: Implement card_store_subkey again.Author
- 30f8a3c87364 agent: Add KEYTOCARD command.Author
- 595ab0da666c Japanese: update po and doc.Author
- 7253093addfd scd: Rename 'keypad' to 'pinpad'.Author
- 21feecd48f99 gpg: Add pinentry-mode feature.Author
- c27315fc6466 scd: Fix check_keypad_request.Author
- e791ac6683bf SCD: Add vendor specific initalization.Author
- 0407e642f796 SCD: Support P=N format for login data.Author
- bd5eded73a12 SCD: Better interoperability.Author
- 334ba6efa5a0 SCD: handle keypad request on the card.Author
- d5bf83a24cf3 SCD: Minor fix of ccid-driver.Author
- b526f6e22360 SCD: API cleanup for keypad handling.Author
- 65eb98966a56 Convert doc/DETAILS to org-modeAuthor
- 50a7badbdaca Remove unused status codesAuthor
- 1cd6445eec4c gpg: Add status line PINENTRY_LAUNCHED.Author
- 4dddf32c83f5 SCD: Hold lock for pinpad input.Author
- a776f660363d SCD: Support not-so-smart card readers.Author
- bb51edc31e65 Update Japanese Translation.Author
- 05a4458e5721 Update Japanese Translation.Author
- 709a8f8125b9 Update Japanese Translation.Author
- 0fae789c4125 Update Japanese Translation.Author