aboutsummaryrefslogtreecommitdiffstats
path: root/sm/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'sm/ChangeLog')
-rw-r--r--sm/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index dc5989ae5..30e71ba8d 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-10 Werner Koch <[email protected]>
+
+ * minip12.c (oid_pkcs5PBKDF2, oid_pkcs5PBES2, oid_aes128_CBC): New.
+ (set_key_iv_pbes2): New.
+ (crypt_block): Add args IV and IVLEN. Call set_key_iv_pbes2.
+ (decrypt_block): Add args IV and IVLEN.
+ (parse_bag_encrypted_data): Hack to support PBES2 data.
+ (parse_bag_data): Ditto.
+
2011-03-03 Werner Koch <[email protected]>
* base64.c (base64_finish_write): Do not copy to radbuf to get rid