Browse Source

Verify remaining precompiled binaries + add extra comments to build(-ce).bat.

Martijn Laan 4 tháng trước cách đây
mục cha
commit
8a552ef397

+ 6 - 0
Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.obj.issig

@@ -0,0 +1,6 @@
+format issig-v1
+file-size 8111
+file-hash 25a946de5cd685e1b010293665ee04eaa24ac9a345a31afaa82217e273459b2c
+key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
+sig-r ebd4a121bba6483e335759c41c285aa582a3d9d1fe5aa0261d86a187d19fc035
+sig-s c0f9e67aaa8c548bf13edb5f4edb1ada130aaa0355e3e702bc837f3121be964c

+ 6 - 0
Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.obj.issig

@@ -0,0 +1,6 @@
+format issig-v1
+file-size 21751
+file-hash 79bb11fbe0b862b6a42af2db4664748daa54347d56b3c40998dcb860111195ac
+key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
+sig-r 9dd4d53f2270c6a0f415fcc553e561b67cc0ba9f067c497f9aa4c40625263737
+sig-s ad98a5f58bff21054c51bc25f4c95fad3e7f669bf1b7068901a52b503414516b

+ 6 - 0
Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.obj.issig

@@ -0,0 +1,6 @@
+format issig-v1
+file-size 93601
+file-hash aad21cad7686f881b461c5727995391a00b48df251893a97e2cb0f9567c10a00
+key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
+sig-r 72598c2e35dc647f0da0c714648ffb30271e6c4e96816aa651fd7d52b584b1e5
+sig-s db13c937f9bce1bf736b57cf62c30d836ae8604bf11a66f69443a6163864dfea

+ 6 - 0
Projects/Src/Setup.HelperEXEs.res.issig

@@ -0,0 +1,6 @@
+format issig-v1
+file-size 6240
+file-hash 0c384c152e4686c6a6a1dbdb1376f9076baa13ad7d6db9891745187f8212f393
+key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
+sig-r ae63371b72241fb9bc4d2ada583a4ff3443261a59885fe5e0b5362c41dde704e
+sig-s 529f2dd4c752daa00e78cdb19579bc22a404b578dcd487209b93580ee652bce9

+ 12 - 0
build-ce.bat

@@ -38,6 +38,17 @@ if not exist files\issigtool.exe (
   echo Compiling ISSigTool done
   echo Compiling ISSigTool done
 )
 )
 
 
+rem  Verify precompiled binaries which are used during compilation
+rem  Note: Other precompiled binaries are verified by Setup.iss
+call .\issig.bat verify --key-file=issig.ispublickey1 ^
+  Projects\Src\Setup.HelperEXEs.res ^
+  Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj ^
+  Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj ^
+  Projects\Src\Compression.SevenZipDecoder\7zDecode\IS7zDec.obj
+if errorlevel 1 goto failed
+echo ISSigTool verify done
+
+rem  Embed user's public key into sources
 call .\issig.bat embed
 call .\issig.bat embed
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 echo ISSigTool embed done
 echo ISSigTool embed done
@@ -75,6 +86,7 @@ if exist .\setup-presign.bat (
   echo Presign done
   echo Presign done
 )
 )
 
 
+rem  Sign using user's private key
 call .\issig.bat sign Files\ISCmplr.dll Files\ISPP.dll
 call .\issig.bat sign Files\ISCmplr.dll Files\ISPP.dll
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 echo ISSigTool sign done
 echo ISSigTool sign done

+ 12 - 0
build.bat

@@ -55,6 +55,17 @@ if not exist files\issigtool.exe (
   echo Compiling ISSigTool done
   echo Compiling ISSigTool done
 )
 )
 
 
+rem  Verify precompiled binaries which are used during compilation
+rem  Note: Other precompiled binaries are verified by Setup.iss
+call .\issig.bat verify --key-file=issig.ispublickey1 ^
+  Projects\Src\Setup.HelperEXEs.res ^
+  Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj ^
+  Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj ^
+  Projects\Src\Compression.SevenZipDecoder\7zDecode\IS7zDec.obj
+if errorlevel 1 goto failed
+echo ISSigTool verify done
+
+rem  Embed user's public key into sources
 call .\issig.bat embed
 call .\issig.bat embed
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 echo ISSigTool embed done
 echo ISSigTool embed done
@@ -69,6 +80,7 @@ if exist .\setup-presign.bat (
   echo Presign done
   echo Presign done
 ) 
 ) 
 
 
+rem  Sign using user's private key
 call .\issig.bat sign Files\ISCmplr.dll Files\ISPP.dll
 call .\issig.bat sign Files\ISCmplr.dll Files\ISPP.dll
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 echo ISSigTool sign done
 echo ISSigTool sign done

+ 5 - 2
issig.bat

@@ -10,6 +10,8 @@ rem  TrustFunc.AllowedPublicKeys.inc and setup.allowedpublickeys.iss (before
 rem  compilation) or to sign files using it (after compilation)
 rem  compilation) or to sign files using it (after compilation)
 rem
 rem
 rem  If the key is missing it will be generated
 rem  If the key is missing it will be generated
+rem
+rem  Also used by build(-ce).bat to verify some precompiled files
 
 
 setlocal
 setlocal
 
 
@@ -39,7 +41,8 @@ if not exist "%ISSIGTOOL_KEY_FILE%" (
 )
 )
 
 
 if "%1"=="embed" goto embed
 if "%1"=="embed" goto embed
-if "%1"=="sign" goto sign
+if "%1"=="sign" goto signorverify
+if "%1"=="verify" goto signorverify
 if not "%1"=="" goto failed
 if not "%1"=="" goto failed
 
 
 :embed
 :embed
@@ -61,7 +64,7 @@ if errorlevel 1 goto failed
 echo Success!
 echo Success!
 goto exit
 goto exit
 
 
-:sign
+:signorverify
 Files\ISSigTool.exe %*
 Files\ISSigTool.exe %*
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 
 

+ 4 - 0
issig.ispublickey1

@@ -0,0 +1,4 @@
+format issig-public-key
+key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
+public-x e3e943066aff8f28d2219fd71c9ffff4c8d1aa26bc4225434be67180ab5e242d
+public-y e419041c3f54551e86a1c47f387005cd535dfc9d64339b30d37f9a4f7866b650