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

more small fix

Browse Source
This commit is contained in:
NIIBE Yutaka
2010-11-08 09:24:52 +09:00
parent 674bf612e4
commit 9c7a085efb
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -2,6 +2,10 @@
* src/openpgp-do.c (do_hist_bytes, do_fp_all, do_cafp_all) * src/openpgp-do.c (do_hist_bytes, do_fp_all, do_cafp_all)
(do_kgtime_all, do_ds_count): Fix return value. (do_kgtime_all, do_ds_count): Fix return value.
(rw_pw_status): Correctly return value.
(proc_resetting_code): Change func proto. to return success/failure.
(proc_key_import): Ditto.
(gpg_do_put_data): Handle return values.
2010-11-05 NIIBE Yutaka <gniibe@fsij.org> 2010-11-05 NIIBE Yutaka <gniibe@fsij.org>

43
src/openpgp-do.c
View File

@@ -421,21 +421,19 @@ rw_pw_status (uint16_t tag, int with_tag,
{ {
flash_bool_clear (&pw1_lifetime_p); flash_bool_clear (&pw1_lifetime_p);
if (pw1_lifetime_p == NULL) if (pw1_lifetime_p == NULL)
GPG_SUCCESS (); return 1;
else else
GPG_MEMORY_FAILURE(); return 0;
} }
else else
{ {
pw1_lifetime_p = flash_bool_write (NR_BOOL_PW1_LIFETIME); pw1_lifetime_p = flash_bool_write (NR_BOOL_PW1_LIFETIME);
if (pw1_lifetime_p != NULL) if (pw1_lifetime_p != NULL)
GPG_SUCCESS (); return 1;
else else
GPG_MEMORY_FAILURE();
}
return 0; return 0;
} }
}
else else
{ {
if (with_tag) if (with_tag)
@@ -455,7 +453,7 @@ rw_pw_status (uint16_t tag, int with_tag,
} }
} }
static void static int
proc_resetting_code (const uint8_t *data, int len) proc_resetting_code (const uint8_t *data, int len)
{ {
const uint8_t *old_ks = keystring_md_pw3; const uint8_t *old_ks = keystring_md_pw3;
@@ -475,14 +473,12 @@ proc_resetting_code (const uint8_t *data, int len)
if (r < -2) if (r < -2)
{ {
DEBUG_INFO ("memory error.\r\n"); DEBUG_INFO ("memory error.\r\n");
GPG_MEMORY_FAILURE (); return 0;
return;
} }
else if (r < 0) else if (r < 0)
{ {
DEBUG_INFO ("security error.\r\n"); DEBUG_INFO ("security error.\r\n");
GPG_SECURITY_FAILURE (); return 0;
return;
} }
else if (r == 0) else if (r == 0)
{ {
@@ -493,10 +489,10 @@ proc_resetting_code (const uint8_t *data, int len)
{ {
DEBUG_INFO ("done.\r\n"); DEBUG_INFO ("done.\r\n");
gpg_do_write_simple (NR_DO_KEYSTRING_RC, new_ks0, 1); gpg_do_write_simple (NR_DO_KEYSTRING_RC, new_ks0, 1);
GPG_SUCCESS ();
} }
gpg_reset_pw_err_counter (PW_ERR_RC); gpg_reset_pw_err_counter (PW_ERR_RC);
return 1;
} }
static void static void
@@ -783,7 +779,7 @@ gpg_do_chks_prvkey (enum kind_of_key kk,
* 93 xx * 93 xx
* 5f48, xx: cardholder private key * 5f48, xx: cardholder private key
*/ */
static void static int
proc_key_import (const uint8_t *data, int len) proc_key_import (const uint8_t *data, int len)
{ {
int r; int r;
@@ -820,17 +816,16 @@ proc_key_import (const uint8_t *data, int len)
gpg_do_write_simple (NR_DO_KEYSTRING_RC, NULL, 0); gpg_do_write_simple (NR_DO_KEYSTRING_RC, NULL, 0);
} }
GPG_SUCCESS (); return 1;
return;
} }
/* It should starts with 00 01 00 01 (E) */ /* It should starts with 00 01 00 01 (E) */
/* Skip E, 4-byte */ /* Skip E, 4-byte */
r = gpg_do_write_prvkey (kk, &data[26], len - 26, keystring_md_pw3); r = gpg_do_write_prvkey (kk, &data[26], len - 26, keystring_md_pw3);
if (r < 0) if (r < 0)
GPG_MEMORY_FAILURE (); return 0;
else else
GPG_SUCCESS (); return 1;
} }
static const uint16_t const cmp_ch_data[] = { static const uint16_t const cmp_ch_data[] = {
@@ -1200,15 +1195,21 @@ gpg_do_put_data (uint16_t tag, const uint8_t *data, int len)
int (*rw_func)(uint16_t, int, const uint8_t *, int, int) int (*rw_func)(uint16_t, int, const uint8_t *, int, int)
= (int (*)(uint16_t, int, const uint8_t *, int, int))do_p->obj; = (int (*)(uint16_t, int, const uint8_t *, int, int))do_p->obj;
rw_func (tag, 0, data, len, 1); if (rw_func (tag, 0, data, len, 1))
GPG_SUCCESS ();
else
GPG_ERROR ();
break; break;
} }
case DO_PROC_WRITE: case DO_PROC_WRITE:
{ {
void (*proc_func)(const uint8_t *, int) int (*proc_func)(const uint8_t *, int)
= (void (*)(const uint8_t *, int))do_p->obj; = (int (*)(const uint8_t *, int))do_p->obj;
proc_func (data, len); if (proc_func (data, len))
GPG_SUCCESS ();
else
GPG_ERROR ();
break; break;
} }
} }