diff options
| author | NIIBE Yutaka <[email protected]> | 2017-03-06 05:59:02 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-03-06 05:59:02 +0000 |
| commit | 9bf39ed75ddbd35908bcd0996f55325ff801619a (patch) | |
| tree | 0f835c9e641909bfad8a69f0702f29de0e87761f /scd/app-p15.c | |
| parent | scd: Clean up old code. (diff) | |
| download | gnupg-9bf39ed75ddbd35908bcd0996f55325ff801619a.tar.gz gnupg-9bf39ed75ddbd35908bcd0996f55325ff801619a.zip | |
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 <[email protected]>
Diffstat (limited to 'scd/app-p15.c')
| -rw-r--r-- | scd/app-p15.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scd/app-p15.c b/scd/app-p15.c index db8c38e99..4072fb715 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -752,7 +752,6 @@ parse_keyusage_flags (const unsigned char *der, size_t derlen, else { bits &= ~mask; - mask = 0; } } else @@ -1388,7 +1387,7 @@ read_ef_cdf (app_t app, unsigned short fid, cdf_object_t *result) if (class != CLASS_UNIVERSAL || tag != TAG_SEQUENCE) { errstr = "unsupported reference type"; - continue; + goto parse_error; } nn = objlen; @@ -1801,7 +1800,6 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result) else { bits &= ~mask; - mask = 0; } } if ((bits & 0x80)) |