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

bug fix.

Browse Source
This commit is contained in:
NIIBE Yutaka
2010-11-05 17:43:01 +09:00
parent 3b7590e6b1
commit a0faafc320
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2010-11-05 NIIBE Yutaka <gniibe@fsij.org> 2010-11-05 NIIBE Yutaka <gniibe@fsij.org>
Bug fix.
* src/openpgp.c (gpg_change_keystring): Handle
GPG_KEY_FOR_AUTHENTICATION.
Bug fixes. Bug fixes.
* src/openpgp-do.c (gpg_do_write_prvkey): compare with != operator. * src/openpgp-do.c (gpg_do_write_prvkey): compare with != operator.
* src/ac.c (verify_admin_0): Don't hardcode 6, but use strlen. * src/ac.c (verify_admin_0): Don't hardcode 6, but use strlen.

12
src/openpgp.c
View File

@@ -150,6 +150,18 @@ gpg_change_keystring (int who_old, const uint8_t *old_ks,
if (r < 0) if (r < 0)
return -2; return -2;
r = gpg_do_load_prvkey (GPG_KEY_FOR_AUTHENTICATION, who_old, old_ks);
if (r < 0)
return r;
if (r > 0)
prv_keys_exist++;
r = gpg_do_chks_prvkey (GPG_KEY_FOR_AUTHENTICATION, who_old, old_ks,
who_new, new_ks);
if (r < 0)
return -2;
if (prv_keys_exist) if (prv_keys_exist)
return 1; return 1;
else else