deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
NIIBE Yutaka
2011-05-10 15:13:15 +09:00
parent 96dc883954
commit 8e765327b2
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -6,8 +6,6 @@
(gpg_pw_increment_err_counter): Rename from gpg_increment_err_counter. (gpg_pw_increment_err_counter): Rename from gpg_increment_err_counter.
* src/ac.c, src/openpgp.c, src/gnuk.h: Follow the change. * src/ac.c, src/openpgp.c, src/gnuk.h: Follow the change.
2011-05-09 NIIBE Yutaka <gniibe@fsij.org>
Bug fixes. Bug fixes.
* src/openpgp.c (cmd_reset_user_password, cmd_change_password) * src/openpgp.c (cmd_reset_user_password, cmd_change_password)
* src/openpgp-do.c (proc_resetting_code): Fix check of return value. * src/openpgp-do.c (proc_resetting_code): Fix check of return value.

6
src/ac.c
View File

@@ -65,7 +65,7 @@ verify_pso_cds (const uint8_t *pw, int pw_len)
int r; int r;
uint8_t keystring[KEYSTRING_SIZE_PW1]; uint8_t keystring[KEYSTRING_SIZE_PW1];
if (gpg_passwd_locked (PW_ERR_PW1)) if (gpg_pw_locked (PW_ERR_PW1))
return 0; return 0;
DEBUG_INFO ("verify_pso_cds\r\n"); DEBUG_INFO ("verify_pso_cds\r\n");
@@ -93,7 +93,7 @@ verify_other (const uint8_t *pw, int pw_len)
DEBUG_INFO ("verify_other\r\n"); DEBUG_INFO ("verify_other\r\n");
if (gpg_passwd_locked (PW_ERR_PW1)) if (gpg_pw_locked (PW_ERR_PW1))
return 0; return 0;
ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1); ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
@@ -170,7 +170,7 @@ verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known)
const uint8_t *pw3_keystring; const uint8_t *pw3_keystring;
int pw_len; int pw_len;
if (gpg_passwd_locked (PW_ERR_PW3)) if (gpg_pw_locked (PW_ERR_PW3))
return 0; return 0;
pw3_keystring = gpg_do_read_simple (NR_DO_KEYSTRING_PW3); pw3_keystring = gpg_do_read_simple (NR_DO_KEYSTRING_PW3);

1
src/openpgp-do.c
View File

@@ -837,7 +837,6 @@ proc_key_import (const uint8_t *data, int len)
{ {
int r; int r;
enum kind_of_key kk; enum kind_of_key kk;
const uint8_t *pw3_keystring;
const uint8_t *keystring_admin; const uint8_t *keystring_admin;
if (admin_authorized == BY_ADMIN) if (admin_authorized == BY_ADMIN)