aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/seckey-cert.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ed26a2391..193bf7b08 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-21 Werner Koch <[email protected]>
+
+ * seckey-cert.c (do_check): Detect card diversion protection.
+
2005-02-09 David Shaw <[email protected]>
* mainproc.c (proc_symkey_enc): Set a flag to indicate that a
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 8870ac3e3..596b8f595 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -49,7 +49,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int *canceled )
CIPHER_HANDLE cipher_hd=NULL;
PKT_secret_key *save_sk;
- if( sk->protect.s2k.mode == 1001 ) {
+ if( sk->protect.s2k.mode == 1001 || sk->protect.s2k.mode == 1002 ) {
log_info(_("secret key parts are not available\n"));
return G10ERR_GENERAL;
}