# HG changeset patch # User Matt Johnston # Date 1496416248 -28800 # Node ID c963afad9eb49ee3c1dacb71bd88c4b6cf7c7687 # Parent f386d2e9dc75f1a493e6bb2fca4c0e5b6ffe71fc# Parent 77c0d57a4410b7103fed5b1af957dc019c22a566 Merge pull request #39 from fperrad/20161118_lint fix indentation diff -r f386d2e9dc75 -r c963afad9eb4 keyimport.c --- a/keyimport.c Fri Jun 02 23:02:34 2017 +0800 +++ b/keyimport.c Fri Jun 02 23:10:48 2017 +0800 @@ -694,7 +694,7 @@ &id, &len, &flags); p += ret; /* id==4 for octet string */ - if (ret < 0 || id != 4 || len < 0 || + if (ret < 0 || id != 4 || len < 0 || key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; goto error; @@ -708,7 +708,7 @@ &id, &len, &flags); p += ret; /* id==0 */ - if (ret < 0 || id != 0 || len < 0) { + if (ret < 0 || id != 0 || len < 0) { errmsg = "ASN.1 decoding failure"; goto error; } @@ -717,7 +717,7 @@ &id, &len, &flags); p += ret; /* id==6 for object */ - if (ret < 0 || id != 6 || len < 0 || + if (ret < 0 || id != 6 || len < 0 || key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; goto error; @@ -756,7 +756,7 @@ &id, &len, &flags); p += ret; /* id==1 */ - if (ret < 0 || id != 1 || len < 0) { + if (ret < 0 || id != 1 || len < 0) { errmsg = "ASN.1 decoding failure"; goto error; } @@ -765,7 +765,7 @@ &id, &len, &flags); p += ret; /* id==3 for bit string */ - if (ret < 0 || id != 3 || len < 0 || + if (ret < 0 || id != 3 || len < 0 || key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; goto error;