Cleanup.

Projects/Src/Setup.Install.pas

@@ -14,6 +14,8 @@ interface
 uses
   Classes, SHA256, Shared.FileClass, Shared.SetupTypes, Shared.Int64Em, Shared.Struct;
 
+function NoVerification: TSetupFileVerification;
+
 procedure VerificationError(const AError: TVerificationError;
   const ASigFilename: String = '');
 
@@ -285,6 +287,12 @@ begin
   end;
 end;
 
+function NoVerification: TSetupFileVerification;
+begin
+  Result := Default(TSetupFileVerification);
+  Result.Typ := fvNone;
+end;
+
 procedure VerificationError(const AError: TVerificationError;
   const ASigFilename: String);
 const
@@ -1594,7 +1602,7 @@ var
                   { Download the .issig file }
                   const ISSigUrl = GetISSigUrl(SourceFile, ExpandConst(CurFile^.DownloadISSigSource));
                   DownloadFile(ISSigUrl, DownloadUserName, DownloadPassword,
-                    ISSigDestF, Default(TSetupFileVerification), '', JustProcessEventsProc64, To64(0));
+                    ISSigDestF, NoVerification, '', JustProcessEventsProc64, To64(0));
                   FreeAndNil(ISSigDestF);
                   { Download and verify the actual file }
                   DownloadFile(SourceFile, DownloadUserName, DownloadPassword,
@@ -1614,7 +1622,7 @@ var
               try
                 LastOperation := SetupMessages[msgErrorCopying];
                 if Assigned(CurFileLocation) then
-                  CopySourceFileToDestFile(SourceF, DestF, Default(TSetupFileVerification),
+                  CopySourceFileToDestFile(SourceF, DestF, NoVerification,
                     '', CurFileLocation^.OriginalSize)
                 else
                   CopySourceFileToDestFile(SourceF, DestF, CurFile^.Verification,

Projects/Src/Setup.ScriptDlg.pas

@@ -1064,7 +1064,7 @@ begin
   F.BaseName := BaseName;
   F.UserName := UserName;
   F.Password := Password;
-  F.Verification := Default(TSetupFileVerification);
+  F.Verification := NoVerification;
   if RequiredSHA256OfFile <> '' then begin
     F.Verification.Typ := fvHash;
     F.Verification.Hash := SHA256DigestFromString(RequiredSHA256OfFile)

Projects/Src/Setup.ScriptFunc.pas

@@ -822,7 +822,7 @@ var
         OnDownloadProgress := TOnDownloadProgress(Stack.GetProc(PStart-4, Caller));
       end;
 
-      var Verification := Default(TSetupFileVerification);
+      var Verification := NoVerification;
       if RequiredSHA256OfFile <> '' then begin
         Verification.Typ := fvHash;
         Verification.Hash := SHA256DigestFromString(RequiredSHA256OfFile)
@@ -833,7 +833,7 @@ var
 
       { Also see Setup.ScriptDlg TDownloadWizardPage.AddExWithISSigVerify }
       if ISSigVerify then
-        DownloadTemporaryFile(GetISSigUrl(Url, ISSigUrl), BaseName + ISSigExt, Default(TSetupFileVerification), OnDownloadProgress);
+        DownloadTemporaryFile(GetISSigUrl(Url, ISSigUrl), BaseName + ISSigExt, NoVerification, OnDownloadProgress);
       Stack.SetInt64(PStart, DownloadTemporaryFile(Url, BaseName, Verification, OnDownloadProgress));
     end);
     RegisterScriptFunc('DownloadTemporaryFileSize', sfNoUninstall, procedure(const Caller: TPSExec; const OrgName: AnsiString; const Stack: TPSStack; const PStart: Cardinal)

Projects/Src/Shared.Struct.pas

@@ -231,7 +231,7 @@ const
   SetupFileEntryAnsiStrings = 1;
 type
   PSetupFileEntry = ^TSetupFileEntry;
-  TSetupFileVerificationType = (fvNone, fvHash, fvISSig); { fvNone must be first }
+  TSetupFileVerificationType = (fvNone, fvHash, fvISSig);
   TSetupFileVerification = packed record
     ISSigAllowedKeys: AnsiString; { Must be first }
     Hash: TSHA256Digest;