From 074feda7aefab83fb3b9e4e3c95cf0fdbe5292cb Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 8 Nov 2010 14:06:54 +0900 Subject: [PATCH] revert wrong change of src/ac.c --- ChangeLog | 6 +++--- src/ac.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0af702..8e0afd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,9 +38,9 @@ * src/openpgp-do.c (gpg_do_write_prvkey): Remove multiple call of flash_do_release. - Bug fixes. - * src/openpgp-do.c (gpg_do_write_prvkey): compare with != operator. - * src/ac.c (verify_admin_0): Don't hardcode 6, but use strlen. + Bug fix. + * src/openpgp-do.c (gpg_do_write_prvkey): Don't hardcode 6, but + use strlen. * src/flash.c, src/gnuk.ld.in: Rename "Flash DO Pool" to "Flash Data Pool", because it's not only DO. diff --git a/src/ac.c b/src/ac.c index 3c018fd..66ba242 100644 --- a/src/ac.c +++ b/src/ac.c @@ -195,7 +195,7 @@ verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known) /* For empty PW3, pass phrase should be OPENPGP_CARD_INITIAL_PW3 */ { if ((pw_len_known >=0 && pw_len_known != strlen (OPENPGP_CARD_INITIAL_PW3)) - || buf_len != (int)strlen (OPENPGP_CARD_INITIAL_PW3) + || buf_len < (int)strlen (OPENPGP_CARD_INITIAL_PW3) || strncmp ((const char *)pw, OPENPGP_CARD_INITIAL_PW3, strlen (OPENPGP_CARD_INITIAL_PW3)) != 0) /* It is failure, but we don't try to lock for the case of empty PW3 */