From 9bf39ed75ddbd35908bcd0996f55325ff801619a Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 6 Mar 2017 14:59:02 +0900 Subject: scd: More cleanup of old code. * scd/app-dinsig.c (do_sign): Remove assignment to HASHALGO. * scd/app-p15.c (parse_keyusage_flags): Remove assign to MASK. (read_ef_aodf): Likewise. (read_ef_cdf): Change the control to parse_error. * scd/app-sc-hsm.c (parse_keyusage_flags): Remove assign to MASK. (read_ef_prkd): Remove assign to S. (read_ef_prkd): Check if PRKDF is not null. (read_ef_cd): Likewise for CDF. Signed-off-by: NIIBE Yutaka --- scd/app-sc-hsm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scd/app-sc-hsm.c') diff --git a/scd/app-sc-hsm.c b/scd/app-sc-hsm.c index c5827345c..dddc8dcfe 100644 --- a/scd/app-sc-hsm.c +++ b/scd/app-sc-hsm.c @@ -414,7 +414,6 @@ parse_keyusage_flags (const unsigned char *der, size_t derlen, else { bits &= ~mask; - mask = 0; } } else @@ -827,7 +826,6 @@ read_ef_prkd (app_t app, unsigned short fid, prkdf_object_t *prkdresult, if (prkdf->usageflags.non_repudiation) { log_printf ("%snon_repudiation", s); - s = ","; } log_printf ("\n"); @@ -891,7 +889,8 @@ read_ef_prkd (app_t app, unsigned short fid, prkdf_object_t *prkdresult, } else { - prkdf->next = *prkdresult; + if (prkdf) + prkdf->next = *prkdresult; *prkdresult = prkdf; if (cdf) { @@ -1112,7 +1111,8 @@ read_ef_cd (app_t app, unsigned short fid, cdf_object_t *result) } else { - cdf->next = *result; + if (cdf) + cdf->next = *result; *result = cdf; } return err; -- cgit v1.2.3