Add issig file-tag value, internal only so far. Redo all .issig for this.

Components/ISSigFunc.pas

@@ -96,17 +96,24 @@ begin
   TSHA256Digest(Result) := SHA256DigestFromString(S);
 end;
 
-function CalcHashToSign(const AIncludeFileName: Boolean; const AFileName: String; const AFileSize: Int64;
-  const AFileHash: TSHA256Digest): TSHA256Digest;
+function CalcHashToSign(const AIncludeFileNameAndTag: Boolean; const AFileName: String; const AFileSize: Int64;
+  const AFileHash: TSHA256Digest; const AFileTag: String): TSHA256Digest;
+
+  procedure SHA256UpdateWithString(var Context: TSHA256Context; const S: String);
+  begin
+    const U = UTF8String(S);
+    const N: Cardinal = Length(U);
+    SHA256Update(Context, N, SizeOf(N));
+    if N > 0 then
+      SHA256Update(Context, Pointer(U)^, N*SizeOf(U[1]));
+  end;
+
 begin
   var Context: TSHA256Context;
   SHA256Init(Context);
-  if AIncludeFileName then begin
-    const UTF8FileName = UTF8String(AFileName);
-    const UTF8FileNameLength: Cardinal = Length(UTF8FileName);
-    SHA256Update(Context, UTF8FileNameLength, SizeOf(UTF8FileNameLength));
-    if UTF8FileNameLength > 0 then
-      SHA256Update(Context, Pointer(UTF8FileName)^, UTF8FileNameLength*SizeOf(UTF8FileName[1]));
+  if AIncludeFileNameAndTag then begin
+    SHA256UpdateWithString(Context, AFileName);
+    SHA256UpdateWithString(Context, AFileTag);
   end;
   SHA256Update(Context, AFileSize, SizeOf(AFileSize));
   SHA256Update(Context, AFileHash, SizeOf(AFileHash));
@@ -185,6 +192,8 @@ end;
 function ISSigCreateSignatureText(const AKey: TECDSAKey;
   const AFileName: String; const AFileSize: Int64; const AFileHash: TSHA256Digest): String;
 begin
+  const AFileTag = ''; { Should be a parameter in the future }
+
   { Ensure unverifiable signature files can't be created accidentally }
   const UTF8FileName = UTF8String(AFileName);
   if Length(UTF8FileName) > 1000 then
@@ -202,7 +211,7 @@ begin
   var PublicKey: TECDSAPublicKey;
   AKey.ExportPublicKey(PublicKey);
 
-  const HashToSign = CalcHashToSign(True, AFileName, AFileSize, AFileHash);
+  const HashToSign = CalcHashToSign(True, AFileName, AFileSize, AFileHash, AFileTag);
   var Sig: TECDSASignature;
   AKey.SignHash(HashToSign, Sig);
 
@@ -211,12 +220,14 @@ begin
     'file-name "%s"'#13#10 +
     'file-size %d'#13#10 +
     'file-hash %s'#13#10 +
+    'file-tag "%s"'#13#10 +
     'key-id %s'#13#10 +
     'sig-r %s'#13#10 +
     'sig-s %s'#13#10,
     [AFileName,
      AFileSize,
      SHA256DigestToString(AFileHash),
+     AFileTag,
      SHA256DigestToString(CalcKeyID(PublicKey)),
      ECDSAInt256ToString(Sig.Sig_r),
      ECDSAInt256ToString(Sig.Sig_s)]);
@@ -225,9 +236,23 @@ end;
 function ISSigVerifySignatureText(const AAllowedKeys: array of TECDSAKey;
   const AText: String; out AFileName: String; out AFileSize: Int64;
   out AFileHash: TSHA256Digest; out AKeyUsedID: String): TISSigVerifySignatureResult;
+
+  function FormatToVersion(const Format: String; out Version: Integer): Boolean;
+  begin
+    if Format = 'issig-v1' then begin
+      Version := 1;
+      Exit(True);
+    end else if Format = 'issig-v2' then begin
+      Version := 2;
+      Exit(True);
+    end else
+      Exit(False);
+  end;
+
 var
   TextValues: record
-    Format, FileName, FileSize, FileHash, KeyID, Sig_r, Sig_s: String;
+    Format, FileName, FileSize, FileHash, FileTag, KeyID, Sig_r, Sig_s: String;
+    Version: Integer;
   end;
 begin
   { To be extra safe, clear the "out" parameters just in case the caller isn't
@@ -235,6 +260,7 @@ begin
   AFileName := '';
   AFileSize := -1;
   FillChar(AFileHash, SizeOf(AFileHash), 0);
+  var AFileTag := ''; { Should be a parameter in the future }
   AKeyUsedID := '';
 
   if Length(AText) > ISSigTextFileLengthLimit then
@@ -244,11 +270,13 @@ begin
 
   var SS := TStringScanner.Create(AText);
   if not ConsumeLineValue(SS, 'format', TextValues.Format, 8, 8, NonControlASCIICharsSet) or
-     ((TextValues.Format <> 'issig-v1') and ((TextValues.Format <> 'issig-v2'))) or
-     ((TextValues.Format = 'issig-v2') and not ConsumeLineValue(SS, 'file-name', TextValues.FileName, 0, MaxInt,
+     not FormatToVersion(TextValues.Format, TextValues.Version) or
+     ((TextValues.Version >= 2) and not ConsumeLineValue(SS, 'file-name', TextValues.FileName, 0, MaxInt,
        (NonControlASCIICharsSet - ['"']) + AllHighCharsSet, True, True)) or
      not ConsumeLineValue(SS, 'file-size', TextValues.FileSize, 1, 16, DigitsSet) or
      not ConsumeLineValue(SS, 'file-hash', TextValues.FileHash, 64, 64, HexDigitsSet) or
+     ((TextValues.Version >= 2) and not ConsumeLineValue(SS, 'file-tag', TextValues.FileTag, 0, MaxInt,
+       (NonControlASCIICharsSet - ['"']) + AllHighCharsSet, True, True)) or
      not ConsumeLineValue(SS, 'key-id', TextValues.KeyID, 64, 64, HexDigitsSet) or
      not ConsumeLineValue(SS, 'sig-r', TextValues.Sig_r, 64, 64, HexDigitsSet) or
      not ConsumeLineValue(SS, 'sig-s', TextValues.Sig_s, 64, 64, HexDigitsSet) or
@@ -278,8 +306,9 @@ begin
   const UnverifiedFileName = TextValues.FileName;
   const UnverifiedFileSize = StrToInt64(TextValues.FileSize);
   const UnverifiedFileHash = SHA256DigestFromString(TextValues.FileHash);
-  const HashToSign = CalcHashToSign(TextValues.Format <> 'issig-v1', UnverifiedFileName,
-    UnverifiedFileSize, UnverifiedFileHash);
+  const UnverifiedFileTag = TextValues.FileTag;
+  const HashToSign = CalcHashToSign(TextValues.Version >= 2, UnverifiedFileName,
+    UnverifiedFileSize, UnverifiedFileHash, UnverifiedFileTag);
   var Sig: TECDSASignature;
   Sig.Sig_r := ECDSAInt256FromString(TextValues.Sig_r);
   Sig.Sig_s := ECDSAInt256FromString(TextValues.Sig_s);
@@ -287,6 +316,7 @@ begin
     AFileName := UnverifiedFileName;
     AFileSize := UnverifiedFileSize;
     AFileHash := UnverifiedFileHash;
+    AFileTag := UnverifiedFileTag;
     Result := vsrSuccess;
   end else
     Result := vsrBad;

Examples/MyDll.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "MyDll.dll"
 file-size 21280
 file-hash f4e549ef947c33a61520a38c855583e48cfd1702303815123662f7e2e4e73e09
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 0ba33df66764201f643189531b10d687767275d5b42f61da16568854b2196577
-sig-s c19753f32422be3d924ca4ecca7529bcc098441d6b9055940fcbcf1c0e3fc4bc
+sig-r 924bb961758ede8e7a6b06e798bb45e0def30c3b56f10e8e2e9717a6e74cc573
+sig-s 3ac3b134b5a2167b41221f73cf854084dd67ffa845a7475cd7e4158ae71b0786

Examples/MyProg-Arm64.exe.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "MyProg-Arm64.exe"
 file-size 77960
 file-hash ca7812155ff5935264177277b7c351ef35deacfda114fe8418d65cbcf105883a
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r f3bdb92812f621a6de7ef9828368f7edf2576f96b984d50bbcefb2eba8cd9240
-sig-s b64a5109feb59393f3237df84c5b21965b46b4b76117316557d8e07d4dea86a0
+sig-r 6609533c534e5c40276dd4d8d0e9895caa2da1ac468f81da1076f5b4f422188c
+sig-s 7c726c104127fb6361e7b7000745534923d9b34a10552d70443cb25d77ceb82b

Examples/MyProg-x64.exe.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "MyProg-x64.exe"
 file-size 77960
 file-hash b50952f9af310be586746356508b9fd430dcbbaa155a04e6f9563632de0a023b
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 0d70aa66576f8cb97ace74dc1d0348c7dfbd6d7d23ed1122185ecca3f79a8e76
-sig-s 6f04303418f230cf52e26285362e0214875f2bf40e9be1c5f9a1dad15649ef24
+sig-r 190988b37803d9ae3c75050c43496225a1e7beaef0abfd0e4806482797707449
+sig-s 0b367bb7e4236ae366eea37ddff343f440b880c2e478df7b08fbade1758cd3b5

Examples/MyProg.exe.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "MyProg.exe"
 file-size 78984
 file-hash be272491050410c39db97101f05e80ed5d30a10caca6bc9f02228aa9499e19c9
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r a2475468aafe1b1841d57e2f863b3d4b30a9956bda1985b8937d0a75bddf13df
-sig-s 3d4a6eb8f93db576e61adf5a2f63e5c6db2cc5bfbd0cf5da8cbada673d458ca6
+sig-r 8484d44b5904d6b4d01c76ccd9ef0367a7cdd1667ba09e3bfb04af5743de3ca4
+sig-s ed6bd58c7e3a126ddf78f5f9b5745ac7e9f29030350e452c9611837c4bf79c82

Files/is7z.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "is7z.dll"
 file-size 992912
 file-hash 74081e3749ab6f833618c4a9efbb75537a4e68e6e0579a7b43270a38224dcb66
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 8a2fc6735ee531c609e8a42a6066082964146303014e2fb531f9ef7be4cbc7cd
-sig-s 18d2b1a76ac430bda8b45d3430084df49776ad572cc884ca041e0d8cf26276c6
+sig-r 40054b783763d5bbb8d7534e5003d7bf5b48614b4898434d6d47746ed0df331e
+sig-s 721deb874c67378e0d700f81e4a35bdb2d179c706965ca132c6647235c0ccb94

Files/is7zxa.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "is7zxa.dll"
 file-size 256656
 file-hash 930152b344518fe0a15592269d432c4433b675bbb898213b6c13d8e526d51edd
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r bbfca4a72f28d37760e75e270e6f3019dc2702e665d97584b0afcd0b76b8ad60
-sig-s a7b5be3e031dd78e3ce7f90630ebf51fb6e27e4b47ac564db9dc818827f3023d
+sig-r 206682fe23fb5427d450483a36e8c805af1f6d1cfee7cb97986613b4eddb8ad3
+sig-s 801ddcfcd1899d5be2cf1a5363a4c0e9a6eb013cec9de98721050baf671f9fe8

Files/is7zxr.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "is7zxr.dll"
 file-size 208016
 file-hash a73acb58b85cce5cb686df5409eb18643797c44ed1820a32d092b20146ad1f6c
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 1d0a3c4b863b4290c60b4af709909e0f4c8a109096c315ce5062d050e0c254fc
-sig-s 672acfb5b9a826c50e39a1607dc0c04647aaef75e9ee93113839fd179f64d009
+sig-r f26fdaace9ccda59ab06fa4487889e495704781b82f164d80ed435d64568366d
+sig-s cd1bc85cd709c8887c3c4e537da80895b982dca2bf8ede3e30c2a4f8fc7b49c3

Files/isbunzip.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "isbunzip.dll"
 file-size 35616
 file-hash 31d04c1e4bfdfa34704c142fa98f80c0a3076e4b312d6ada57c4be9d9c7dcf26
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 6c4817d6d038737484fb61c62f8b7c7d6aa6beeb5670c11b5f8d6ae42dd6b4cf
-sig-s c62ef533b240cdba85350f01f9369e7cebfc8b30e2d83e15d2fef9302ba4861b
+sig-r c8484eb8243dbe175bbdc8cdc24b4db1fc57d5a773447d615b715860825fd07a
+sig-s 22fb16e9f29f6060ddfe0c6356dbc0656b78c81d7f92eac943a50a09262d95aa

Files/isbzip.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "isbzip.dll"
 file-size 39200
 file-hash 8072e83385afc4a84006271a87a11fc0a22b149cbd77322669ca56c470d28ced
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 7d093d4fce5875c77a9ce077596c26bd1a06ff15f2795c59c0ccb2403f1081f9
-sig-s b1f7738c3e21f627748185d59132e926bb1519940249bb579c316449aefbcb89
+sig-r de7a5822a1a55de4f573805afd57b1993ac58c5058c63a69ed4ab70c2c199c70
+sig-s 93655f90f7435ec0ec772cea9ac73a0dbf7e842107bb610e6107086578fc3f4c

Files/islzma.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "islzma.dll"
 file-size 135816
 file-hash b252471e95f0853902b15ae71a90574f9b168f8d4a0c474b20537511f90220a5
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r e9202d1a1e43b43b44bf6187c0709b8ca461934499941e147f24f6b123ac9b62
-sig-s baa08eede390e0c152dd1b238b74aa91e057cad50be7a2eab76721d0c658c9b0
+sig-r fb93b45c8a032554fc65903776ab7783f95fe3c3603524c61163bae253958de4
+sig-s fdf1ed2c94a64b415896d28ac6e8b41a9a0cb16cc8d372e1d7be76445b5bc600

Files/islzma32.exe.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "islzma32.exe"
 file-size 199304
 file-hash 5665e03297af04d4f90423b56e8b016b2924d91ba781573036b710044e843f0a
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 6c4aec258115243eacd7db49103ce1772c489cf7bc4c9931f095745203387f61
-sig-s 37e3f126dece0547de4f0cc810b5a84984fbd325a6a030e911d1c1eff6c6ed03
+sig-r a47b07dfa78c7845821a5c4122cb177d7c0e4e4ace9fe8d53564b7756ecbc598
+sig-s 0674b22927c82a6386d2eef2da7d20df12bed627dce36021ff5e6cf2933566da

Files/islzma64.exe.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "islzma64.exe"
 file-size 230536
 file-hash b0ad1857da7fb94b54988c7633578dc057b51cf921b94f6f2f7b57a113310712
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 6ffd0494e423b05ca1358fa9717591ce43ce4d43467d6ca0cc581fde426cef15
-sig-s 26e70aaa5db22b8d7261a837405dc61083593dfb864ccef0bd0eac3223abeb60
+sig-r 299c59b267ab06a38beb9ab28e0cfc001914bcf68495611fae73b06259981192
+sig-s 8cecbd5dcc971b603c56b937cf35859c0669883a417776c8bf5cbeacb4f70e3a

Files/isscint.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "isscint.dll"
 file-size 809616
 file-hash 1a837b73d60a4d98060e8129a8da0b27e25445a2ee8f03b0118b0ec6213172b5
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 4f4093af223ba477bd768ba65b61017f009f1f20bf9fceccae358d5e5675ced0
-sig-s 0d5b283181342e44d49c0363706355432526400211585d69ea3b14d743b26efd
+sig-r 30a54774e3d7773970349a0e9b54a124268b07780881a6f03274017c04c32e17
+sig-s f81d47fbc2472ee2e4e70cafba078093430e7c7226d357a335ccce002cb1d6bf

Files/isunzlib.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "isunzlib.dll"
 file-size 29472
 file-hash 8287d0e287a66ee78537c8d1d98e426562b95c50f569b92cea9ce36a9fa57e64
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r bef7420079e4b440739822dcc03031489e90e017ca17763627b75a3639910610
-sig-s e835d7ea5bc6fa9b0ef55377f01d276040b78708206bf875c6f7ed69f5ca2139
+sig-r 38b503247b387939c50c45e4a84f9abcc6e1486b48a9166edd28652faced77fd
+sig-s 0eeee06d93c4bc69ecd88f9a058630007703ea285a36444a57056f3f532cb872

Files/iszlib.dll.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "iszlib.dll"
 file-size 34592
 file-hash 14c0d4a2a41572384f8309cdf03de5c6e7ed46bef64cce70d989b2665eff1a47
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 590d17da6ab0782ce599550c483446fdd5bae5eb16dd8bd912d4ce61ef8b4a3e
-sig-s c745f5d6cb756f02ecac092cd48bff47a79b37c2bd05de292dd592642ac76a7e
+sig-r d31c63bffb15dc179f8c589cf956a08967e312f58f268dea451ff8dcc609c108
+sig-s 63aff5169ca160ac3af6fe4b1ab6b03897cc3072dc9ab4f460592c92c106ddfa

Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.obj.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "LzmaDecodeInno.obj"
 file-size 8111
 file-hash 25a946de5cd685e1b010293665ee04eaa24ac9a345a31afaa82217e273459b2c
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r f6485228a0d808247279e2a353749a009fe9fb8db1bb317d4fee446fb8c59528
-sig-s 360700779e90850e42d67d0962cc8ff6debbd532f7eec8003cb20fcf0c823b51
+sig-r 1a77103c322f9f685e91939ae2ca044dd8bff48c03d21fb5c31168f21690717b
+sig-s e31ebb23dc8ede2802fa649f634f9fe625bae2a4fb5a741b5375ed13f7cda3ca

Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.obj.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "ISLzmaDec.obj"
 file-size 21751
 file-hash 79bb11fbe0b862b6a42af2db4664748daa54347d56b3c40998dcb860111195ac
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r d183a61aaf8de0b72176e9dd613cc568371866be46683d0b47953794879c6db2
-sig-s ae48b841c532c852fc985d9fe95ae030fe4220735c53eb8d7d9374922a364636
+sig-r 5653a50fed00f5783a88a9b6bc9ada2bd9a74f0dd7ee1ccd61e58724d8d61ec8
+sig-s 8a4c67e578e990061a56abbaf03e39464c44494a136eb2899f430d944eeeb0ee

Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.obj.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "IS7zDec.obj"
 file-size 93886
 file-hash 43ef412680232ecf42556737b7ea1c341f8134e64bf0b36932458e97d569d7c5
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r b3ecb3cf5bbf3c5feded032817f2821df7d845b690f67572584342f9c4f7ab95
-sig-s bd4b2d56fe4133866bc3466acd533eb6972cee09553963a0a35f2e630d389704
+sig-r 46004c60d2d7e59202b263a1798b429523898152c2b0543513efc98cb82539c7
+sig-s 41cee9e379f13152982b0d0c4a6e70751db45953c0065bca97d11c092e50c6dd

Projects/Src/Setup.HelperEXEs.res.issig

@@ -2,6 +2,7 @@ format issig-v2
 file-name "Setup.HelperEXEs.res"
 file-size 6240
 file-hash 0c384c152e4686c6a6a1dbdb1376f9076baa13ad7d6db9891745187f8212f393
+file-tag ""
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r 0c69711682123f852b3690a952743f283386d3f79f8a8131193acddb054eff14
-sig-s 425cbce2b075dc68d91b51b180fe3dfdce5d8e42d803968005b9be57cecdaa11
+sig-r 93be1ec6ebd074680006fee978f498e4f13c566b647dbbef423dbda8827b3693
+sig-s 76afb50649b52ed5ce3200c56909b3f2f905473d781fc3f3f461775f43700cad