summaryrefslogtreecommitdiffstats
path: root/sm/ChangeLog
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-06-17 17:44:44 +0200
committerWerner Koch <wk@gnupg.org>2010-06-17 17:44:44 +0200
commit006fd75aea5cc766bc223e435e5a07b543d658d3 (patch)
tree2f4365e73bf0a8b5272426fcf1fde9b75be4002e /sm/ChangeLog
parentAdd makefiles to build a w32 development package. (diff)
downloadgnupg2-006fd75aea5cc766bc223e435e5a07b543d658d3.tar.xz
gnupg2-006fd75aea5cc766bc223e435e5a07b543d658d3.zip
Avoid using the protect-tool to import pkcs#12.
Diffstat (limited to 'sm/ChangeLog')
-rw-r--r--sm/ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index ebcd30589..686baca3a 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-17 Werner Koch <wk@g10code.com>
+
+ * import.c (parse_p12): Remove arg retfp. Use the agent's new
+ import command.
+ (import_one): Adjust call to pkcs12.
+ (store_cert_cb, rsa_key_check): New.
+ (popen_protect_tool): Remove.
+ * minip12.c (parse_bag_encrypted_data, p12_parse): Add arg
+ R_BADPASS.
+ * call-agent.c (gpgsm_agent_ask_passphrase): New.
+ (gpgsm_agent_keywrap_key): New.
+ (struct import_key_parm_s): New.
+ (gpgsm_agent_import_key): New.
+ * minip12.c, minip12.h: Move from ../agent/.
+ * Makefile.am (gpgsm_SOURCES): Add them.
+
2010-06-11 Marcus Brinkmann <marcus@g10code.de>
* server.c (cmd_message) [HAVE_W32CE_SYSTEM]: Finish pipe.