diff --git a/pycatfile.py b/pycatfile.py index 581ac35..c64b204 100755 --- a/pycatfile.py +++ b/pycatfile.py @@ -3354,7 +3354,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi if(len(filecontent) == 0): checksumlist = [checksumtype[0], "none"] else: - checksumlist = checksumtype + checksumlist = [checksumtype[0], checksumtype[1]] outfileoutstr = outfileoutstr + \ AppendNullBytes(checksumlist, formatspecs['format_delimiter']) nullstrecd = formatspecs['format_delimiter'].encode('UTF-8') @@ -7280,18 +7280,18 @@ def CatFileValidate(infile, fmttype="auto", formatspecs=__file_format_multi_dict valid_archive = False invalid_archive = True if(outfjsonsize > 0): - if(outfcs == infcs): + if(outfjsonchecksum == injsonfcs): if(verbose): VerbosePrintOut( "File JSON Data Checksum Passed at offset " + str(outfjstart)) - VerbosePrintOut("'" + outfcs + "' == " + - "'" + infcs + "'") + VerbosePrintOut("'" + outfjsonchecksum + "' == " + + "'" + injsonfcs + "'") else: if(verbose): VerbosePrintOut( "File JSON Data Checksum Error at offset " + str(outfjstart)) - VerbosePrintOut("'" + outfcs + "' != " + - "'" + infcs + "'") + VerbosePrintOut("'" + outfjsonchecksum + "' != " + + "'" + injsonfcs + "'") valid_archive = False invalid_archive = True outfcontentstart = fp.tell()