From c04e5d816ca2e846663d87d20c074e3dfbd04c10 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 12 May 2011 18:05:39 +0900 Subject: [PATCH] fix condition of ac_check_status --- ChangeLog | 3 +++ src/openpgp.c | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80b05c1..aa5d5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-05-12 NIIBE Yutaka + * src/openpgp.c (cmd_pso, cmd_internal_authenticate) + (cmd_update_binary, cmd_write_binary): Don't check pw locked. + * tool/dfuse.py (DFU_STM32.verify): Add missing colon. * tool/dfuse.py (get_device): Restrict to STMicro DfuSe. diff --git a/src/openpgp.c b/src/openpgp.c index 7c5e58a..98e6b19 100644 --- a/src/openpgp.c +++ b/src/openpgp.c @@ -766,8 +766,7 @@ cmd_pso (void) { DEBUG_SHORT (len); - if (gpg_pw_locked (PW_ERR_PW1) - || !ac_check_status (AC_OTHER_AUTHORIZED)) + if (!ac_check_status (AC_OTHER_AUTHORIZED)) { DEBUG_INFO ("security error."); GPG_SECURITY_FAILURE (); @@ -783,7 +782,7 @@ cmd_pso (void) GPG_ERROR (); } else - { /* XXX: not yet supported */ + { DEBUG_INFO (" - ??"); DEBUG_BYTE (cmd_APDU[2]); DEBUG_INFO (" - ??"); @@ -813,8 +812,7 @@ cmd_internal_authenticate (void) { DEBUG_SHORT (len); - if (gpg_pw_locked (PW_ERR_PW1) - || !ac_check_status (AC_OTHER_AUTHORIZED)) + if (!ac_check_status (AC_OTHER_AUTHORIZED)) { DEBUG_INFO ("security error."); GPG_SECURITY_FAILURE (); @@ -855,7 +853,7 @@ cmd_update_binary (void) DEBUG_INFO (" - UPDATE BINARY\r\n"); - if (gpg_pw_locked (PW_ERR_PW3) || !ac_check_status (AC_ADMIN_AUTHORIZED)) + if (!ac_check_status (AC_ADMIN_AUTHORIZED)) { DEBUG_INFO ("security error."); GPG_SECURITY_FAILURE (); @@ -926,7 +924,7 @@ cmd_write_binary (void) DEBUG_INFO (" - WRITE BINARY\r\n"); - if (gpg_pw_locked (PW_ERR_PW3) || !ac_check_status (AC_ADMIN_AUTHORIZED)) + if (!ac_check_status (AC_ADMIN_AUTHORIZED)) { DEBUG_INFO ("security error."); GPG_SECURITY_FAILURE ();