diff --git a/.cvsignore b/.cvsignore index f3fb68a..15b8144 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,4 +7,7 @@ AppUpdater.aps *.vs*.opendb *.vs*.db *.vs*.user +.github +.git +.vs sav diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ba390a..4ef0dd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,9 +8,9 @@ jobs: matrix: os: [windows-2019] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 - - uses: microsoft/setup-msbuild@v1.0.2 + - uses: microsoft/setup-msbuild@v2 - name: Windows 8.1 SDK shell: powershell run: | diff --git a/.gitignore b/.gitignore index 170f249..b3a4c03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # General CVS/ compat/ +*.pem # MSVC working Debug.vs*/ diff --git a/AutoUpdater.vs140.sln b/AutoUpdater.vs140.sln index dbe4ad4..c97fa3f 100644 --- a/AutoUpdater.vs140.sln +++ b/AutoUpdater.vs140.sln @@ -3,24 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libappupdater", "msvc\libappupdater.vs140.vcxproj", "{D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libappupdater", "msvc\libappupdater.vs140.vcxproj", "{EBA010B5-F14F-4AED-9E6B-D519BACD1615}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAutoUpdater", "msvc\CAutoUpdater.vs140.vcxproj", "{9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAutoUpdater", "msvc\TAutoUpdater.vs140.vcxproj", "{A1BE9C67-A52A-46CC-8548-8C03C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSRes", "msvc\NSRes.vs140.vcxproj", "{A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibappupdater", "msvc\TLibappupdater.vs140.vcxproj", "{DFB46FDD-20AF-4044-AFE8-46A3218C5081}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyGen", "msvc\KeyGen.vs140.vcxproj", "{A1BE9C67-2A56-41BC-A518-76C03C53FCF2}" + ProjectSection(ProjectDependencies) = postProject + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SignTool", "msvc\SignTool.vs140.vcxproj", "{A1BE9C67-1B56-41BC-A518-76C03C53FCF2}" + ProjectSection(ProjectDependencies) = postProject + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -30,14 +38,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|Win32.Build.0 = Debug|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|x64.ActiveCfg = Debug|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|x64.Build.0 = Debug|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|Win32.ActiveCfg = Release|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|Win32.Build.0 = Release|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|x64.ActiveCfg = Release|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|x64.Build.0 = Release|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|Win32.Build.0 = Debug|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|x64.ActiveCfg = Debug|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|x64.Build.0 = Debug|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|Win32.ActiveCfg = Release|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|Win32.Build.0 = Release|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|x64.ActiveCfg = Release|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|x64.Build.0 = Release|x64 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.ActiveCfg = Debug|Win32 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.Build.0 = Debug|Win32 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|x64.ActiveCfg = Debug|x64 @@ -62,16 +70,27 @@ Global {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|Win32.Build.0 = Release|Win32 {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|x64.ActiveCfg = Release|x64 {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|x64.Build.0 = Release|x64 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Debug|Win32.ActiveCfg = Debug|Win32 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Debug|Win32.Build.0 = Debug|Win32 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Debug|x64.ActiveCfg = Debug|x64 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Debug|x64.Build.0 = Debug|x64 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Release|Win32.ActiveCfg = Release|Win32 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Release|Win32.Build.0 = Release|Win32 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Release|x64.ActiveCfg = Release|x64 - {DFB46FDD-20AF-4044-AFE8-46A3218C5081}.Release|x64.Build.0 = Release|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|Win32.Build.0 = Debug|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|x64.ActiveCfg = Debug|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|x64.Build.0 = Debug|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|Win32.ActiveCfg = Release|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|Win32.Build.0 = Release|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|x64.ActiveCfg = Release|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|x64.Build.0 = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|Win32.Build.0 = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|x64.ActiveCfg = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|x64.Build.0 = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|Win32.ActiveCfg = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|Win32.Build.0 = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|x64.ActiveCfg = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {176D351E-082D-4713-B3D4-7229F3F72ACE} + EndGlobalSection EndGlobal diff --git a/AutoUpdater.vs160.sln b/AutoUpdater.vs160.sln index 3ff58c0..914cad2 100644 --- a/AutoUpdater.vs160.sln +++ b/AutoUpdater.vs160.sln @@ -3,21 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31605.320 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libappupdater", "msvc\libappupdater.vs160.vcxproj", "{D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libappupdater", "msvc\libappupdater.vs160.vcxproj", "{EBA010B5-F14F-4AED-9E6B-D519BACD1615}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAutoUpdater", "msvc\CAutoUpdater.vs160.vcxproj", "{9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAutoUpdater", "msvc\TAutoUpdater.vs160.vcxproj", "{A1BE9C67-A52A-46CC-8548-8C03C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSRes", "msvc\NSRes.vs160.vcxproj", "{A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}" ProjectSection(ProjectDependencies) = postProject - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} = {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyGen", "msvc\KeyGen.vs160.vcxproj", "{A1BE9C67-2A56-41BC-A518-76C03C53FCF2}" + ProjectSection(ProjectDependencies) = postProject + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SignTool", "msvc\SignTool.vs160.vcxproj", "{A1BE9C67-1B56-41BC-A518-76C03C53FCF2}" + ProjectSection(ProjectDependencies) = postProject + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateTool", "msvc\UpdateTool.vs160.vcxproj", "{A1BE9C67-1B56-41BC-A518-76C03C53FC42}" + ProjectSection(ProjectDependencies) = postProject + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} = {EBA010B5-F14F-4AED-9E6B-D519BACD1615} EndProjectSection EndProject Global @@ -28,14 +43,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|Win32.Build.0 = Debug|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|x64.ActiveCfg = Debug|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Debug|x64.Build.0 = Debug|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|Win32.ActiveCfg = Release|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|Win32.Build.0 = Release|Win32 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|x64.ActiveCfg = Release|x64 - {D2998A79-52C1-4CF1-A166-9AC6C0AA7E3B}.Release|x64.Build.0 = Release|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|Win32.Build.0 = Debug|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|x64.ActiveCfg = Debug|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Debug|x64.Build.0 = Debug|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|Win32.ActiveCfg = Release|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|Win32.Build.0 = Release|Win32 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|x64.ActiveCfg = Release|x64 + {EBA010B5-F14F-4AED-9E6B-D519BACD1615}.Release|x64.Build.0 = Release|x64 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.ActiveCfg = Debug|Win32 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.Build.0 = Debug|Win32 {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|x64.ActiveCfg = Debug|x64 @@ -60,6 +75,30 @@ Global {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|Win32.Build.0 = Release|Win32 {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|x64.ActiveCfg = Release|x64 {A1BE9C67-2AAA-46BB-8548-8C03C53FCF2E}.Release|x64.Build.0 = Release|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|Win32.Build.0 = Debug|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|x64.ActiveCfg = Debug|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Debug|x64.Build.0 = Debug|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|Win32.ActiveCfg = Release|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|Win32.Build.0 = Release|Win32 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|x64.ActiveCfg = Release|x64 + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2}.Release|x64.Build.0 = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|Win32.Build.0 = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|x64.ActiveCfg = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Debug|x64.Build.0 = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|Win32.ActiveCfg = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|Win32.Build.0 = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|x64.ActiveCfg = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2}.Release|x64.Build.0 = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Debug|Win32.Build.0 = Debug|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Debug|x64.ActiveCfg = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Debug|x64.Build.0 = Debug|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Release|Win32.ActiveCfg = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Release|Win32.Build.0 = Release|Win32 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Release|x64.ActiveCfg = Release|x64 + {A1BE9C67-1B56-41BC-A518-76C03C53FC42}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AutoUpdater.vs90.sln b/AutoUpdater.vs90.sln deleted file mode 100644 index 5f42bf0..0000000 --- a/AutoUpdater.vs90.sln +++ /dev/null @@ -1,35 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libappupdater", "msvc\libappupdater.vs90.vcproj", "{B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAutoUpdater", "msvc\CAutoUpdater.vs90.vcproj", "{9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}" - ProjectSection(ProjectDependencies) = postProject - {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D} = {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAutoUpdater", "msvc\TAutoUpdater.vs90.vcproj", "{9C67A1BE-A52B-56CC-8C23-8549B53FCF2A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D}.Debug|Win32.Build.0 = Debug|Win32 - {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D}.Release|Win32.ActiveCfg = Release|Win32 - {B8AD3730-CB63-8A4B-36BA-F9E4827A4E4D}.Release|Win32.Build.0 = Release|Win32 - {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Debug|Win32.Build.0 = Debug|Win32 - {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Release|Win32.ActiveCfg = Release|Win32 - {9C67A1BE-A52A-46CC-8C03-8548C53FCF2E}.Release|Win32.Build.0 = Release|Win32 - {9C67A1BE-A52B-56CC-8C23-8549B53FCF2A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9C67A1BE-A52B-56CC-8C23-8549B53FCF2A}.Debug|Win32.Build.0 = Debug|Win32 - {9C67A1BE-A52B-56CC-8C23-8549B53FCF2A}.Release|Win32.ActiveCfg = Release|Win32 - {9C67A1BE-A52B-56CC-8C23-8549B53FCF2A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/NEWS.md b/NEWS.md index 032e433..3c1e848 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,5 +6,10 @@ * github release/latest support +# libappupdater 1.0.3 + +* Ed25519 support + + diff --git a/README.md b/README.md index 047ed8b..ba02020 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,218 @@ # libappupdater -

Windows application updater library, similar to Sparkle and WinSparke. The library checks for updates from a remote server or file-system, which inturn notifies the user of your apps' update and prompts an optional installation. This process can be executed periodically within your application with limited user interaction.

+

Windows application updater library, similar to Sparkle and WinSparkle. The library checks for updates from a remote server or file-system, which inturn notifies the user of your apps' update and prompts an optional installation. This process can be executed periodically within your application with limited user interaction.

It is a win32 native stand-alone library without any non-system external dependencies, permitting both GUI and console interaction.

Due to minimal external dependencies supports MSVC 2008+ and OpenWatcom and run on Windows XP or greater. Other toolchains should be possible with minimal effort.

+### Graphic Interface + ![Prompt Dialog](art/Prompt_Example.png) ![Install Dialog](art/Install_Example.png) +### Console Interface + ![Console Interface](art/Console_Example.png) +## EdDSA (ed25519) signatures + +As the updater is downloading an installer from a remote location, security must be considered. + +By default for data integrity the installer is signed using both MD5 and SHA hashes, for greater security installers can also be signed using a [EdDSA and Ed25519](https://cryptobook.nakov.com/digital-signatures/eddsa-and-ed25519) signature. + +## KeyGen + +To prepare signing with EdDSA signatures, run _keygen_ (from the package distribution), this action only needs to be performed once. Keygen shall generate both a private key and associated public key as pem style file images. The private key is required to sign an installer whereas the public key is used to verify. + +``` +keygen -K application_private.pem -k application_public.pem +``` + +These files should be stored securely in a non public location. If the private-key is lost, you wont be able to recover the key and shall be unable to issue new releases under the same key. A new key-pair and associated key-version shall need to generated. + +It shall also display the public key encoded as a base64-encoded string, which is required to embed into your updater applications. The key files shall be needed when generating an application signature block. + +``` + Generating and + A key-pair has been generated and saved locally. + Add the following public-key into your updater application. + + "VVAqoUagyW3ZfSt+7RfrGHFFY301CEkismrVJtxFjfU=" +``` + +Rerunning _keygen_ shall only load any local pem images and redisplay the public key. + +## SignTool + +To sign an installer, the _SignTool_ application is run, for example + +``` +signtool -K application_private.pem -x 1 -v 0.0.1 \ + -H https://github.com/user/repo~application.manifest application-installer-0.0.1.exe +``` + +The resulting signature block is exported that can then by cut & pasted into the application manifest, +which you can value add to include a change notice related to the installer release. + +```xml + + + +1745138422 +Sun, 20 Apr 2025 16:40:22 +0000 + +``` + +### sign application integration + +To simplifying application integration a customised version of _signtool_ can be built. +Using the provided application shim, default arguments can be provided stream-lining software management. + +```C++ +// +// signtool specialisation +// +#include "libappupdater/sign/signtoolshim.h" // SignToolShim() + +int +main(int argc, char *argv[]) +{ + struct SignToolArgs args = {0}; + + args.hosturl = "https://github.com/user/repo~application.manifest"; + + return SignToolShim(argc, argv, &args); +} +``` + +## Example application.manifest + +```xml + + + + Application Change Channel + https://github.com/user/repo/release/latest + Most recent changes with links to updates. + en + + Application 1.0.3, minor release + +body { font: 80%/1.5em Verdana, Tahoma, arial, Sans-serif; background: #ECECEA; color: #333; } +h1 { font: Bold 150% Verdana, 'Trebuchet MS', Sans-serif; color: #558C89; text-align: center; border-bottom: 1px solid #000000; } +h2 { font: Bold 120% Verdana, 'Trebuchet MS', Sans-serif; color: #74AFAD; border-width: 0px; } +p { margin: 0; padding: 10px 0 0 0; } +ul.a { list-style-type: circle; padding: 0px; margin: 0px; } +ul.b { list-style-type: square; padding: 0px; margin: 0px; } + + +

Change Log

+

+ The major changes for this application release are listed below. + A more specific list of changes and fixes can be found in the detailed change log. +

+
    +
  • Updater 1.0.3 integration.
    • +
+ + ]]> + + 1745138422 + Sun, 20 Apr 2025 16:40:22 +0000 + + + + +``` + +### Updater application integration + +Application integration can be achieved using several methods. + + - As a stand-alone updater application; or + - embedded within the target application. + +Working examples are provided as test applications. For following demonstrates one method + +#### Standalone integration: + +```C++ +#include "libappupdater/update/updatetoolshim.h" // UpdaterToolShim() + +#include "version.h" // VERSION_TAG, build-system version. +#include "public_key.h" // PUBLIC_KEY and KEY_VERSION, see: keygen + +int +main(int argc, char *argv[]) +{ + struct UpdateToolArgs args = {0}; + + args.progtitle = "MyApplication updater"; + + args.appname = "MyApplication"; + args.version = VERSION_TAG; + args.hosturl = "https://github.com/user/repo~application.manifest"; + + args.publickey = PUBLIC_KEY; + args.keyversion = KEY_VERSION; + + return UpdateToolShim(argc, argv, &args); +} +``` + +#### Embedded integration: + +```C++ +#include "libappupdater/src/AutoUpdater.h" // AutoUpdater + +#include "version.h" // VERSION_TAG, build-system version. +#include "public_key.h" // PUBLIC_KEY and KEY_VERSION, see: keygen + +int +Application::CheckForUpdates() +{ + AutoUpdater au; + + // Note parameters stated either by: + // o Explicit run-time arguments; or + // o Application resource elements, alone-side VERSIONINFO information; + // see AutoConfig.h for further details. + // + au.EnableDialog(); + + au.AppName("MyApplication"); + au.AppVersion(VERSION_TAG); + + au.HostURL("https://github.com/user/repo~application.manifest"); + au.PublicKey(PUBLIC_KEY, KEY_VERSION); + + au.Execute(AutoUpdater::ExecuteAuto, true); +} +``` + ## License MIT License diff --git a/TODO.md b/TODO.md index aa9d977..2a0f7ce 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,9 @@ # Possible future development -* DSA signatures [RFC 8032] (mbedtls pending, maybe https://github.com/orlp/ed25519). + * DSA signatures [RFC 8032]. [done] + * PassPhase private keys. + * Background periodic thread. + * Consider importing Sparkle lproj's [work in progress]. -* Background periodic thread. - -* Consider importing Sparkle lproj's. + diff --git a/ed25519/license.txt b/ed25519/license.txt new file mode 100644 index 0000000..c1503f9 --- /dev/null +++ b/ed25519/license.txt @@ -0,0 +1,16 @@ +Copyright (c) 2015 Orson Peters + +This software is provided 'as-is', without any express or implied warranty. In no event will the +authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial +applications, and to alter it and redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the + original software. If you use this software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be misrepresented as + being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/ed25519/readme.md b/ed25519/readme.md new file mode 100644 index 0000000..0a24c1a --- /dev/null +++ b/ed25519/readme.md @@ -0,0 +1,171 @@ +Ed25519 +======= + +This is a portable implementation of [Ed25519](http://ed25519.cr.yp.to/) based +on the SUPERCOP "ref10" implementation. Additionally there is key exchanging +and scalar addition included to further aid building a PKI using Ed25519. All +code is licensed under the permissive zlib license. + +All code is pure ANSI C without any dependencies, except for the random seed +generation which uses standard OS cryptography APIs (`CryptGenRandom` on +Windows, `/dev/urandom` on nix). If you wish to be entirely portable define +`ED25519_NO_SEED`. This disables the `ed25519_create_seed` function, so if your +application requires key generation you must supply your own seeding function +(which is simply a 256 bit (32 byte) cryptographic random number generator). + + +Performance +----------- + +On a Windows machine with an Intel Pentium B970 @ 2.3GHz I got the following +speeds (running on only one a single core): + + Seed generation: 64us (15625 per second) + Key generation: 88us (11364 per second) + Message signing (short message): 87us (11494 per second) + Message verifying (short message): 228us (4386 per second) + Scalar addition: 100us (10000 per second) + Key exchange: 220us (4545 per second) + +The speeds on other machines may vary. Sign/verify times will be higher with +longer messages. The implementation significantly benefits from 64 bit +architectures, if possible compile as 64 bit. + + +Usage +----- + +Simply add all .c and .h files in the `src/` folder to your project and include +`ed25519.h` in any file you want to use the API. If you prefer to use a shared +library, only copy `ed25519.h` and define `ED25519_DLL` before importing. A +windows DLL is pre-built. + +There are no defined types for seeds, private keys, public keys, shared secrets +or signatures. Instead simple `unsigned char` buffers are used with the +following sizes: + +```c +unsigned char seed[32]; +unsigned char signature[64]; +unsigned char public_key[32]; +unsigned char private_key[64]; +unsigned char scalar[32]; +unsigned char shared_secret[32]; +``` + +**Note:** this library stores private keys in a different format than some other +libraries, notably `libsodium`. They tend to store the concatenation of the `seed` +and `public_key` as their private key representation. If you wish to be compatible +with these libraries you must keep the seed around. + +API +--- + +```c +int ed25519_create_seed(unsigned char *seed); +``` + +Creates a 32 byte random seed in `seed` for key generation. `seed` must be a +writable 32 byte buffer. Returns 0 on success, and nonzero on failure. + +```c +void ed25519_create_keypair(unsigned char *public_key, unsigned char *private_key, + const unsigned char *seed); +``` + +Creates a new key pair from the given seed. `public_key` must be a writable 32 +byte buffer, `private_key` must be a writable 64 byte buffer and `seed` must be +a 32 byte buffer. + +```c +void ed25519_sign(unsigned char *signature, + const unsigned char *message, size_t message_len, + const unsigned char *public_key, const unsigned char *private_key); +``` + +Creates a signature of the given message with the given key pair. `signature` +must be a writable 64 byte buffer. `message` must have at least `message_len` +bytes to be read. + +```c +int ed25519_verify(const unsigned char *signature, + const unsigned char *message, size_t message_len, + const unsigned char *public_key); +``` + +Verifies the signature on the given message using `public_key`. `signature` +must be a readable 64 byte buffer. `message` must have at least `message_len` +bytes to be read. Returns 1 if the signature matches, 0 otherwise. + +```c +void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, + const unsigned char *scalar); +``` + +Adds `scalar` to the given key pair where scalar is a 32 byte buffer (possibly +generated with `ed25519_create_seed`), generating a new key pair. You can +calculate the public key sum without knowing the private key and vice versa by +passing in `NULL` for the key you don't know. This is useful for enforcing +randomness on a key pair by a third party while only knowing the public key, +among other things. Warning: the last bit of the scalar is ignored - if +comparing scalars make sure to clear it with `scalar[31] &= 127`. + + +```c +void ed25519_key_exchange(unsigned char *shared_secret, + const unsigned char *public_key, const unsigned char *private_key); +``` + +Performs a key exchange on the given public key and private key, producing a +shared secret. It is recommended to hash the shared secret before using it. +`shared_secret` must be a 32 byte writable buffer where the shared secret will +be stored. + +Example +------- + +```c +unsigned char seed[32], public_key[32], private_key[64], signature[64]; +unsigned char other_public_key[32], other_private_key[64], shared_secret[32]; +const unsigned char message[] = "TEST MESSAGE"; + +/* create a random seed, and a key pair out of that seed */ +if (ed25519_create_seed(seed)) { + printf("error while generating seed\n"); + exit(1); +} + +ed25519_create_keypair(public_key, private_key, seed); + +/* create signature on the message with the key pair */ +ed25519_sign(signature, message, strlen(message), public_key, private_key); + +/* verify the signature */ +if (ed25519_verify(signature, message, strlen(message), public_key)) { + printf("valid signature\n"); +} else { + printf("invalid signature\n"); +} + +/* create a dummy keypair to use for a key exchange, normally you'd only have +the public key and receive it through some communication channel */ +if (ed25519_create_seed(seed)) { + printf("error while generating seed\n"); + exit(1); +} + +ed25519_create_keypair(other_public_key, other_private_key, seed); + +/* do a key exchange with other_public_key */ +ed25519_key_exchange(shared_secret, other_public_key, private_key); + +/* + the magic here is that ed25519_key_exchange(shared_secret, public_key, + other_private_key); would result in the same shared_secret +*/ + +``` + +License +------- +All code is released under the zlib license. See license.txt for details. diff --git a/ed25519/src/add_scalar.c b/ed25519/src/add_scalar.c new file mode 100644 index 0000000..5599683 --- /dev/null +++ b/ed25519/src/add_scalar.c @@ -0,0 +1,69 @@ +#include "ed25519.h" +#include "ge.h" +#include "sc.h" +#include "sha512.h" + + +/* see http://crypto.stackexchange.com/a/6215/4697 */ +void ed25519_add_scalar(unsigned char *public_key_write, unsigned char *private_key_write, const unsigned char *scalar) { + const unsigned char SC_1[32] = {1}; /* scalar with value 1 */ + + unsigned char n[32]; + ge_p3 nB; + ge_p1p1 A_p1p1; + ge_p3 A; + ge_p3 public_key_unpacked; + ge_cached T; + + sha512_context hash; + unsigned char hashbuf[64]; + + int i; + + /* copy the scalar and clear highest bit */ + for (i = 0; i < 31; ++i) { + n[i] = scalar[i]; + } + n[31] = scalar[31] & 127; + + /* private key: a = n + t */ + if (private_key_write) { + sc_muladd(private_key_write, SC_1, n, private_key_write); + + // https://github.com/orlp/ed25519/issues/3 + sha512_init(&hash); + sha512_update(&hash, private_key_write + 32, 32); + sha512_update(&hash, scalar, 32); + sha512_final(&hash, hashbuf); + for (i = 0; i < 32; ++i) { + private_key_write[32 + i] = hashbuf[i]; + } + } + + /* public key: A = nB + T */ + if (public_key_write) { + /* if we know the private key we don't need a point addition, which is faster */ + /* using a "timing attack" you could find out wether or not we know the private + key, but this information seems rather useless - if this is important pass + public_key and private_key seperately in 2 function calls */ + if (private_key_write) { + ge_scalarmult_base(&A, private_key_write); + } else { + /* unpack public key into T */ + ge_frombytes_negate_vartime(&public_key_unpacked, public_key_write); + fe_neg(public_key_unpacked.X, public_key_unpacked.X); /* undo negate */ + fe_neg(public_key_unpacked.T, public_key_unpacked.T); /* undo negate */ + ge_p3_to_cached(&T, &public_key_unpacked); + + /* calculate n*B */ + ge_scalarmult_base(&nB, n); + + /* A = n*B + T */ + ge_add(&A_p1p1, &nB, &T); + ge_p1p1_to_p3(&A, &A_p1p1); + } + + /* pack public key */ + ge_p3_tobytes(public_key_write, &A); + } +} diff --git a/ed25519/src/ed25519.h b/ed25519/src/ed25519.h new file mode 100644 index 0000000..48cba99 --- /dev/null +++ b/ed25519/src/ed25519.h @@ -0,0 +1,42 @@ +#ifndef ED25519_H +#define ED25519_H + +#include + +#if defined(_WIN32) + #if defined(ED25519_BUILD_DLL) + #define ED25519_DECLSPEC __declspec(dllexport) + #elif defined(ED25519_DLL) + #define ED25519_DECLSPEC __declspec(dllimport) + #else + #define ED25519_DECLSPEC + #endif +#else + #define ED25519_DECLSPEC +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef ED25519_NO_SEED +int ED25519_DECLSPEC ed25519_create_seed(unsigned char *seed); +#endif + +void ED25519_DECLSPEC ed25519_create_keypair(unsigned char *public_key_write, unsigned char *private_key_write, const unsigned char *seed); +void ED25519_DECLSPEC ed25519_sign(unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key_write, const unsigned char *private_key_write); +int ED25519_DECLSPEC ed25519_verify(const unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key_write); +void ED25519_DECLSPEC ed25519_add_scalar(unsigned char *public_key_write, unsigned char *private_key_write, const unsigned char *scalar); +void ED25519_DECLSPEC ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key_write, const unsigned char *private_key_write); + +//extension +void ED25519_DECLSPEC * ed25519_verify_init(const unsigned char *signature, const unsigned char *public_key_write); +void ED25519_DECLSPEC ed25519_verify_update(void *context, const unsigned char *message, size_t message_len); +int ED25519_DECLSPEC ed25519_verify_final(void *context); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/ed25519/src/fe.c b/ed25519/src/fe.c new file mode 100644 index 0000000..2105eb7 --- /dev/null +++ b/ed25519/src/fe.c @@ -0,0 +1,1491 @@ +#include "fixedint.h" +#include "fe.h" + + +/* + helper functions +*/ +static uint64_t load_3(const unsigned char *in) { + uint64_t result; + + result = (uint64_t) in[0]; + result |= ((uint64_t) in[1]) << 8; + result |= ((uint64_t) in[2]) << 16; + + return result; +} + +static uint64_t load_4(const unsigned char *in) { + uint64_t result; + + result = (uint64_t) in[0]; + result |= ((uint64_t) in[1]) << 8; + result |= ((uint64_t) in[2]) << 16; + result |= ((uint64_t) in[3]) << 24; + + return result; +} + + + +/* + h = 0 +*/ + +void fe_0(fe h) { + h[0] = 0; + h[1] = 0; + h[2] = 0; + h[3] = 0; + h[4] = 0; + h[5] = 0; + h[6] = 0; + h[7] = 0; + h[8] = 0; + h[9] = 0; +} + + + +/* + h = 1 +*/ + +void fe_1(fe h) { + h[0] = 1; + h[1] = 0; + h[2] = 0; + h[3] = 0; + h[4] = 0; + h[5] = 0; + h[6] = 0; + h[7] = 0; + h[8] = 0; + h[9] = 0; +} + + + +/* + h = f + g + Can overlap h with f or g. + + Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + + Postconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +void fe_add(fe h, const fe f, const fe g) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t g0 = g[0]; + int32_t g1 = g[1]; + int32_t g2 = g[2]; + int32_t g3 = g[3]; + int32_t g4 = g[4]; + int32_t g5 = g[5]; + int32_t g6 = g[6]; + int32_t g7 = g[7]; + int32_t g8 = g[8]; + int32_t g9 = g[9]; + int32_t h0 = f0 + g0; + int32_t h1 = f1 + g1; + int32_t h2 = f2 + g2; + int32_t h3 = f3 + g3; + int32_t h4 = f4 + g4; + int32_t h5 = f5 + g5; + int32_t h6 = f6 + g6; + int32_t h7 = f7 + g7; + int32_t h8 = f8 + g8; + int32_t h9 = f9 + g9; + + h[0] = h0; + h[1] = h1; + h[2] = h2; + h[3] = h3; + h[4] = h4; + h[5] = h5; + h[6] = h6; + h[7] = h7; + h[8] = h8; + h[9] = h9; +} + + + +/* + Replace (f,g) with (g,g) if b == 1; + replace (f,g) with (f,g) if b == 0. + + Preconditions: b in {0,1}. +*/ + +void fe_cmov(fe f, const fe g, unsigned int b) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t g0 = g[0]; + int32_t g1 = g[1]; + int32_t g2 = g[2]; + int32_t g3 = g[3]; + int32_t g4 = g[4]; + int32_t g5 = g[5]; + int32_t g6 = g[6]; + int32_t g7 = g[7]; + int32_t g8 = g[8]; + int32_t g9 = g[9]; + int32_t x0 = f0 ^ g0; + int32_t x1 = f1 ^ g1; + int32_t x2 = f2 ^ g2; + int32_t x3 = f3 ^ g3; + int32_t x4 = f4 ^ g4; + int32_t x5 = f5 ^ g5; + int32_t x6 = f6 ^ g6; + int32_t x7 = f7 ^ g7; + int32_t x8 = f8 ^ g8; + int32_t x9 = f9 ^ g9; + + b = (unsigned int) (- (int) b); /* silence warning */ + x0 &= b; + x1 &= b; + x2 &= b; + x3 &= b; + x4 &= b; + x5 &= b; + x6 &= b; + x7 &= b; + x8 &= b; + x9 &= b; + + f[0] = f0 ^ x0; + f[1] = f1 ^ x1; + f[2] = f2 ^ x2; + f[3] = f3 ^ x3; + f[4] = f4 ^ x4; + f[5] = f5 ^ x5; + f[6] = f6 ^ x6; + f[7] = f7 ^ x7; + f[8] = f8 ^ x8; + f[9] = f9 ^ x9; +} + +/* + Replace (f,g) with (g,f) if b == 1; + replace (f,g) with (f,g) if b == 0. + + Preconditions: b in {0,1}. +*/ + +void fe_cswap(fe f,fe g,unsigned int b) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t g0 = g[0]; + int32_t g1 = g[1]; + int32_t g2 = g[2]; + int32_t g3 = g[3]; + int32_t g4 = g[4]; + int32_t g5 = g[5]; + int32_t g6 = g[6]; + int32_t g7 = g[7]; + int32_t g8 = g[8]; + int32_t g9 = g[9]; + int32_t x0 = f0 ^ g0; + int32_t x1 = f1 ^ g1; + int32_t x2 = f2 ^ g2; + int32_t x3 = f3 ^ g3; + int32_t x4 = f4 ^ g4; + int32_t x5 = f5 ^ g5; + int32_t x6 = f6 ^ g6; + int32_t x7 = f7 ^ g7; + int32_t x8 = f8 ^ g8; + int32_t x9 = f9 ^ g9; + b = (unsigned int) (- (int) b); /* silence warning */ + x0 &= b; + x1 &= b; + x2 &= b; + x3 &= b; + x4 &= b; + x5 &= b; + x6 &= b; + x7 &= b; + x8 &= b; + x9 &= b; + f[0] = f0 ^ x0; + f[1] = f1 ^ x1; + f[2] = f2 ^ x2; + f[3] = f3 ^ x3; + f[4] = f4 ^ x4; + f[5] = f5 ^ x5; + f[6] = f6 ^ x6; + f[7] = f7 ^ x7; + f[8] = f8 ^ x8; + f[9] = f9 ^ x9; + g[0] = g0 ^ x0; + g[1] = g1 ^ x1; + g[2] = g2 ^ x2; + g[3] = g3 ^ x3; + g[4] = g4 ^ x4; + g[5] = g5 ^ x5; + g[6] = g6 ^ x6; + g[7] = g7 ^ x7; + g[8] = g8 ^ x8; + g[9] = g9 ^ x9; +} + + + +/* + h = f +*/ + +void fe_copy(fe h, const fe f) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + + h[0] = f0; + h[1] = f1; + h[2] = f2; + h[3] = f3; + h[4] = f4; + h[5] = f5; + h[6] = f6; + h[7] = f7; + h[8] = f8; + h[9] = f9; +} + + + +/* + Ignores top bit of h. +*/ + +void fe_frombytes(fe h, const unsigned char *s) { + int64_t h0 = load_4(s); + int64_t h1 = load_3(s + 4) << 6; + int64_t h2 = load_3(s + 7) << 5; + int64_t h3 = load_3(s + 10) << 3; + int64_t h4 = load_3(s + 13) << 2; + int64_t h5 = load_4(s + 16); + int64_t h6 = load_3(s + 20) << 7; + int64_t h7 = load_3(s + 23) << 5; + int64_t h8 = load_3(s + 26) << 4; + int64_t h9 = (load_3(s + 29) & 8388607) << 2; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + + carry9 = (h9 + (int64_t) (1 << 24)) >> 25; + h0 += carry9 * 19; + h9 -= carry9 << 25; + carry1 = (h1 + (int64_t) (1 << 24)) >> 25; + h2 += carry1; + h1 -= carry1 << 25; + carry3 = (h3 + (int64_t) (1 << 24)) >> 25; + h4 += carry3; + h3 -= carry3 << 25; + carry5 = (h5 + (int64_t) (1 << 24)) >> 25; + h6 += carry5; + h5 -= carry5 << 25; + carry7 = (h7 + (int64_t) (1 << 24)) >> 25; + h8 += carry7; + h7 -= carry7 << 25; + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + carry2 = (h2 + (int64_t) (1 << 25)) >> 26; + h3 += carry2; + h2 -= carry2 << 26; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry6 = (h6 + (int64_t) (1 << 25)) >> 26; + h7 += carry6; + h6 -= carry6 << 26; + carry8 = (h8 + (int64_t) (1 << 25)) >> 26; + h9 += carry8; + h8 -= carry8 << 26; + + h[0] = (int32_t) h0; + h[1] = (int32_t) h1; + h[2] = (int32_t) h2; + h[3] = (int32_t) h3; + h[4] = (int32_t) h4; + h[5] = (int32_t) h5; + h[6] = (int32_t) h6; + h[7] = (int32_t) h7; + h[8] = (int32_t) h8; + h[9] = (int32_t) h9; +} + + + +void fe_invert(fe out, const fe z) { + fe t0; + fe t1; + fe t2; + fe t3; + int i; + + fe_sq(t0, z); + + for (i = 1; i < 1; ++i) { + fe_sq(t0, t0); + } + + fe_sq(t1, t0); + + for (i = 1; i < 2; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t1, z, t1); + fe_mul(t0, t0, t1); + fe_sq(t2, t0); + + for (i = 1; i < 1; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t1, t2); + fe_sq(t2, t1); + + for (i = 1; i < 5; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t2, t1); + fe_sq(t2, t1); + + for (i = 1; i < 10; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t2, t2, t1); + fe_sq(t3, t2); + + for (i = 1; i < 20; ++i) { + fe_sq(t3, t3); + } + + fe_mul(t2, t3, t2); + fe_sq(t2, t2); + + for (i = 1; i < 10; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t2, t1); + fe_sq(t2, t1); + + for (i = 1; i < 50; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t2, t2, t1); + fe_sq(t3, t2); + + for (i = 1; i < 100; ++i) { + fe_sq(t3, t3); + } + + fe_mul(t2, t3, t2); + fe_sq(t2, t2); + + for (i = 1; i < 50; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t2, t1); + fe_sq(t1, t1); + + for (i = 1; i < 5; ++i) { + fe_sq(t1, t1); + } + + fe_mul(out, t1, t0); +} + + + +/* + return 1 if f is in {1,3,5,...,q-2} + return 0 if f is in {0,2,4,...,q-1} + + Preconditions: + |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +int fe_isnegative(const fe f) { + unsigned char s[32]; + + fe_tobytes(s, f); + + return s[0] & 1; +} + + + +/* + return 1 if f == 0 + return 0 if f != 0 + + Preconditions: + |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +int fe_isnonzero(const fe f) { + unsigned char s[32]; + unsigned char r; + + fe_tobytes(s, f); + + r = s[0]; + #define F(i) r |= s[i] + F(1); + F(2); + F(3); + F(4); + F(5); + F(6); + F(7); + F(8); + F(9); + F(10); + F(11); + F(12); + F(13); + F(14); + F(15); + F(16); + F(17); + F(18); + F(19); + F(20); + F(21); + F(22); + F(23); + F(24); + F(25); + F(26); + F(27); + F(28); + F(29); + F(30); + F(31); + #undef F + + return r != 0; +} + + + +/* + h = f * g + Can overlap h with f or g. + + Preconditions: + |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. + |g| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. + + Postconditions: + |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. + */ + + /* + Notes on implementation strategy: + + Using schoolbook multiplication. + Karatsuba would save a little in some cost models. + + Most multiplications by 2 and 19 are 32-bit precomputations; + cheaper than 64-bit postcomputations. + + There is one remaining multiplication by 19 in the carry chain; + one *19 precomputation can be merged into this, + but the resulting data flow is considerably less clean. + + There are 12 carries below. + 10 of them are 2-way parallelizable and vectorizable. + Can get away with 11 carries, but then data flow is much deeper. + + With tighter constraints on inputs can squeeze carries into int32. +*/ + +void fe_mul(fe h, const fe f, const fe g) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t g0 = g[0]; + int32_t g1 = g[1]; + int32_t g2 = g[2]; + int32_t g3 = g[3]; + int32_t g4 = g[4]; + int32_t g5 = g[5]; + int32_t g6 = g[6]; + int32_t g7 = g[7]; + int32_t g8 = g[8]; + int32_t g9 = g[9]; + int32_t g1_19 = 19 * g1; /* 1.959375*2^29 */ + int32_t g2_19 = 19 * g2; /* 1.959375*2^30; still ok */ + int32_t g3_19 = 19 * g3; + int32_t g4_19 = 19 * g4; + int32_t g5_19 = 19 * g5; + int32_t g6_19 = 19 * g6; + int32_t g7_19 = 19 * g7; + int32_t g8_19 = 19 * g8; + int32_t g9_19 = 19 * g9; + int32_t f1_2 = 2 * f1; + int32_t f3_2 = 2 * f3; + int32_t f5_2 = 2 * f5; + int32_t f7_2 = 2 * f7; + int32_t f9_2 = 2 * f9; + int64_t f0g0 = f0 * (int64_t) g0; + int64_t f0g1 = f0 * (int64_t) g1; + int64_t f0g2 = f0 * (int64_t) g2; + int64_t f0g3 = f0 * (int64_t) g3; + int64_t f0g4 = f0 * (int64_t) g4; + int64_t f0g5 = f0 * (int64_t) g5; + int64_t f0g6 = f0 * (int64_t) g6; + int64_t f0g7 = f0 * (int64_t) g7; + int64_t f0g8 = f0 * (int64_t) g8; + int64_t f0g9 = f0 * (int64_t) g9; + int64_t f1g0 = f1 * (int64_t) g0; + int64_t f1g1_2 = f1_2 * (int64_t) g1; + int64_t f1g2 = f1 * (int64_t) g2; + int64_t f1g3_2 = f1_2 * (int64_t) g3; + int64_t f1g4 = f1 * (int64_t) g4; + int64_t f1g5_2 = f1_2 * (int64_t) g5; + int64_t f1g6 = f1 * (int64_t) g6; + int64_t f1g7_2 = f1_2 * (int64_t) g7; + int64_t f1g8 = f1 * (int64_t) g8; + int64_t f1g9_38 = f1_2 * (int64_t) g9_19; + int64_t f2g0 = f2 * (int64_t) g0; + int64_t f2g1 = f2 * (int64_t) g1; + int64_t f2g2 = f2 * (int64_t) g2; + int64_t f2g3 = f2 * (int64_t) g3; + int64_t f2g4 = f2 * (int64_t) g4; + int64_t f2g5 = f2 * (int64_t) g5; + int64_t f2g6 = f2 * (int64_t) g6; + int64_t f2g7 = f2 * (int64_t) g7; + int64_t f2g8_19 = f2 * (int64_t) g8_19; + int64_t f2g9_19 = f2 * (int64_t) g9_19; + int64_t f3g0 = f3 * (int64_t) g0; + int64_t f3g1_2 = f3_2 * (int64_t) g1; + int64_t f3g2 = f3 * (int64_t) g2; + int64_t f3g3_2 = f3_2 * (int64_t) g3; + int64_t f3g4 = f3 * (int64_t) g4; + int64_t f3g5_2 = f3_2 * (int64_t) g5; + int64_t f3g6 = f3 * (int64_t) g6; + int64_t f3g7_38 = f3_2 * (int64_t) g7_19; + int64_t f3g8_19 = f3 * (int64_t) g8_19; + int64_t f3g9_38 = f3_2 * (int64_t) g9_19; + int64_t f4g0 = f4 * (int64_t) g0; + int64_t f4g1 = f4 * (int64_t) g1; + int64_t f4g2 = f4 * (int64_t) g2; + int64_t f4g3 = f4 * (int64_t) g3; + int64_t f4g4 = f4 * (int64_t) g4; + int64_t f4g5 = f4 * (int64_t) g5; + int64_t f4g6_19 = f4 * (int64_t) g6_19; + int64_t f4g7_19 = f4 * (int64_t) g7_19; + int64_t f4g8_19 = f4 * (int64_t) g8_19; + int64_t f4g9_19 = f4 * (int64_t) g9_19; + int64_t f5g0 = f5 * (int64_t) g0; + int64_t f5g1_2 = f5_2 * (int64_t) g1; + int64_t f5g2 = f5 * (int64_t) g2; + int64_t f5g3_2 = f5_2 * (int64_t) g3; + int64_t f5g4 = f5 * (int64_t) g4; + int64_t f5g5_38 = f5_2 * (int64_t) g5_19; + int64_t f5g6_19 = f5 * (int64_t) g6_19; + int64_t f5g7_38 = f5_2 * (int64_t) g7_19; + int64_t f5g8_19 = f5 * (int64_t) g8_19; + int64_t f5g9_38 = f5_2 * (int64_t) g9_19; + int64_t f6g0 = f6 * (int64_t) g0; + int64_t f6g1 = f6 * (int64_t) g1; + int64_t f6g2 = f6 * (int64_t) g2; + int64_t f6g3 = f6 * (int64_t) g3; + int64_t f6g4_19 = f6 * (int64_t) g4_19; + int64_t f6g5_19 = f6 * (int64_t) g5_19; + int64_t f6g6_19 = f6 * (int64_t) g6_19; + int64_t f6g7_19 = f6 * (int64_t) g7_19; + int64_t f6g8_19 = f6 * (int64_t) g8_19; + int64_t f6g9_19 = f6 * (int64_t) g9_19; + int64_t f7g0 = f7 * (int64_t) g0; + int64_t f7g1_2 = f7_2 * (int64_t) g1; + int64_t f7g2 = f7 * (int64_t) g2; + int64_t f7g3_38 = f7_2 * (int64_t) g3_19; + int64_t f7g4_19 = f7 * (int64_t) g4_19; + int64_t f7g5_38 = f7_2 * (int64_t) g5_19; + int64_t f7g6_19 = f7 * (int64_t) g6_19; + int64_t f7g7_38 = f7_2 * (int64_t) g7_19; + int64_t f7g8_19 = f7 * (int64_t) g8_19; + int64_t f7g9_38 = f7_2 * (int64_t) g9_19; + int64_t f8g0 = f8 * (int64_t) g0; + int64_t f8g1 = f8 * (int64_t) g1; + int64_t f8g2_19 = f8 * (int64_t) g2_19; + int64_t f8g3_19 = f8 * (int64_t) g3_19; + int64_t f8g4_19 = f8 * (int64_t) g4_19; + int64_t f8g5_19 = f8 * (int64_t) g5_19; + int64_t f8g6_19 = f8 * (int64_t) g6_19; + int64_t f8g7_19 = f8 * (int64_t) g7_19; + int64_t f8g8_19 = f8 * (int64_t) g8_19; + int64_t f8g9_19 = f8 * (int64_t) g9_19; + int64_t f9g0 = f9 * (int64_t) g0; + int64_t f9g1_38 = f9_2 * (int64_t) g1_19; + int64_t f9g2_19 = f9 * (int64_t) g2_19; + int64_t f9g3_38 = f9_2 * (int64_t) g3_19; + int64_t f9g4_19 = f9 * (int64_t) g4_19; + int64_t f9g5_38 = f9_2 * (int64_t) g5_19; + int64_t f9g6_19 = f9 * (int64_t) g6_19; + int64_t f9g7_38 = f9_2 * (int64_t) g7_19; + int64_t f9g8_19 = f9 * (int64_t) g8_19; + int64_t f9g9_38 = f9_2 * (int64_t) g9_19; + int64_t h0 = f0g0 + f1g9_38 + f2g8_19 + f3g7_38 + f4g6_19 + f5g5_38 + f6g4_19 + f7g3_38 + f8g2_19 + f9g1_38; + int64_t h1 = f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19; + int64_t h2 = f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38; + int64_t h3 = f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19; + int64_t h4 = f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38; + int64_t h5 = f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19; + int64_t h6 = f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38; + int64_t h7 = f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19; + int64_t h8 = f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38; + int64_t h9 = f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0 ; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + + carry1 = (h1 + (int64_t) (1 << 24)) >> 25; + h2 += carry1; + h1 -= carry1 << 25; + carry5 = (h5 + (int64_t) (1 << 24)) >> 25; + h6 += carry5; + h5 -= carry5 << 25; + + carry2 = (h2 + (int64_t) (1 << 25)) >> 26; + h3 += carry2; + h2 -= carry2 << 26; + carry6 = (h6 + (int64_t) (1 << 25)) >> 26; + h7 += carry6; + h6 -= carry6 << 26; + + carry3 = (h3 + (int64_t) (1 << 24)) >> 25; + h4 += carry3; + h3 -= carry3 << 25; + carry7 = (h7 + (int64_t) (1 << 24)) >> 25; + h8 += carry7; + h7 -= carry7 << 25; + + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry8 = (h8 + (int64_t) (1 << 25)) >> 26; + h9 += carry8; + h8 -= carry8 << 26; + + carry9 = (h9 + (int64_t) (1 << 24)) >> 25; + h0 += carry9 * 19; + h9 -= carry9 << 25; + + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + + h[0] = (int32_t) h0; + h[1] = (int32_t) h1; + h[2] = (int32_t) h2; + h[3] = (int32_t) h3; + h[4] = (int32_t) h4; + h[5] = (int32_t) h5; + h[6] = (int32_t) h6; + h[7] = (int32_t) h7; + h[8] = (int32_t) h8; + h[9] = (int32_t) h9; +} + + +/* +h = f * 121666 +Can overlap h with f. + +Preconditions: + |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. + +Postconditions: + |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +*/ + +void fe_mul121666(fe h, fe f) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int64_t h0 = f0 * (int64_t) 121666; + int64_t h1 = f1 * (int64_t) 121666; + int64_t h2 = f2 * (int64_t) 121666; + int64_t h3 = f3 * (int64_t) 121666; + int64_t h4 = f4 * (int64_t) 121666; + int64_t h5 = f5 * (int64_t) 121666; + int64_t h6 = f6 * (int64_t) 121666; + int64_t h7 = f7 * (int64_t) 121666; + int64_t h8 = f8 * (int64_t) 121666; + int64_t h9 = f9 * (int64_t) 121666; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + + carry9 = (h9 + (int64_t) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25; + carry1 = (h1 + (int64_t) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25; + carry3 = (h3 + (int64_t) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25; + carry5 = (h5 + (int64_t) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25; + carry7 = (h7 + (int64_t) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25; + + carry0 = (h0 + (int64_t) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26; + carry2 = (h2 + (int64_t) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26; + carry4 = (h4 + (int64_t) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26; + carry6 = (h6 + (int64_t) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26; + carry8 = (h8 + (int64_t) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26; + + h[0] = (int32_t) h0; + h[1] = (int32_t) h1; + h[2] = (int32_t) h2; + h[3] = (int32_t) h3; + h[4] = (int32_t) h4; + h[5] = (int32_t) h5; + h[6] = (int32_t) h6; + h[7] = (int32_t) h7; + h[8] = (int32_t) h8; + h[9] = (int32_t) h9; +} + + +/* +h = -f + +Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + +Postconditions: + |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +*/ + +void fe_neg(fe h, const fe f) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t h0 = -f0; + int32_t h1 = -f1; + int32_t h2 = -f2; + int32_t h3 = -f3; + int32_t h4 = -f4; + int32_t h5 = -f5; + int32_t h6 = -f6; + int32_t h7 = -f7; + int32_t h8 = -f8; + int32_t h9 = -f9; + + h[0] = h0; + h[1] = h1; + h[2] = h2; + h[3] = h3; + h[4] = h4; + h[5] = h5; + h[6] = h6; + h[7] = h7; + h[8] = h8; + h[9] = h9; +} + + +void fe_pow22523(fe out, const fe z) { + fe t0; + fe t1; + fe t2; + int i; + fe_sq(t0, z); + + for (i = 1; i < 1; ++i) { + fe_sq(t0, t0); + } + + fe_sq(t1, t0); + + for (i = 1; i < 2; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t1, z, t1); + fe_mul(t0, t0, t1); + fe_sq(t0, t0); + + for (i = 1; i < 1; ++i) { + fe_sq(t0, t0); + } + + fe_mul(t0, t1, t0); + fe_sq(t1, t0); + + for (i = 1; i < 5; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t0, t1, t0); + fe_sq(t1, t0); + + for (i = 1; i < 10; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t1, t1, t0); + fe_sq(t2, t1); + + for (i = 1; i < 20; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t2, t1); + fe_sq(t1, t1); + + for (i = 1; i < 10; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t0, t1, t0); + fe_sq(t1, t0); + + for (i = 1; i < 50; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t1, t1, t0); + fe_sq(t2, t1); + + for (i = 1; i < 100; ++i) { + fe_sq(t2, t2); + } + + fe_mul(t1, t2, t1); + fe_sq(t1, t1); + + for (i = 1; i < 50; ++i) { + fe_sq(t1, t1); + } + + fe_mul(t0, t1, t0); + fe_sq(t0, t0); + + for (i = 1; i < 2; ++i) { + fe_sq(t0, t0); + } + + fe_mul(out, t0, z); + return; +} + + +/* +h = f * f +Can overlap h with f. + +Preconditions: + |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. + +Postconditions: + |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. +*/ + +/* +See fe_mul.c for discussion of implementation strategy. +*/ + +void fe_sq(fe h, const fe f) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t f0_2 = 2 * f0; + int32_t f1_2 = 2 * f1; + int32_t f2_2 = 2 * f2; + int32_t f3_2 = 2 * f3; + int32_t f4_2 = 2 * f4; + int32_t f5_2 = 2 * f5; + int32_t f6_2 = 2 * f6; + int32_t f7_2 = 2 * f7; + int32_t f5_38 = 38 * f5; /* 1.959375*2^30 */ + int32_t f6_19 = 19 * f6; /* 1.959375*2^30 */ + int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */ + int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */ + int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */ + int64_t f0f0 = f0 * (int64_t) f0; + int64_t f0f1_2 = f0_2 * (int64_t) f1; + int64_t f0f2_2 = f0_2 * (int64_t) f2; + int64_t f0f3_2 = f0_2 * (int64_t) f3; + int64_t f0f4_2 = f0_2 * (int64_t) f4; + int64_t f0f5_2 = f0_2 * (int64_t) f5; + int64_t f0f6_2 = f0_2 * (int64_t) f6; + int64_t f0f7_2 = f0_2 * (int64_t) f7; + int64_t f0f8_2 = f0_2 * (int64_t) f8; + int64_t f0f9_2 = f0_2 * (int64_t) f9; + int64_t f1f1_2 = f1_2 * (int64_t) f1; + int64_t f1f2_2 = f1_2 * (int64_t) f2; + int64_t f1f3_4 = f1_2 * (int64_t) f3_2; + int64_t f1f4_2 = f1_2 * (int64_t) f4; + int64_t f1f5_4 = f1_2 * (int64_t) f5_2; + int64_t f1f6_2 = f1_2 * (int64_t) f6; + int64_t f1f7_4 = f1_2 * (int64_t) f7_2; + int64_t f1f8_2 = f1_2 * (int64_t) f8; + int64_t f1f9_76 = f1_2 * (int64_t) f9_38; + int64_t f2f2 = f2 * (int64_t) f2; + int64_t f2f3_2 = f2_2 * (int64_t) f3; + int64_t f2f4_2 = f2_2 * (int64_t) f4; + int64_t f2f5_2 = f2_2 * (int64_t) f5; + int64_t f2f6_2 = f2_2 * (int64_t) f6; + int64_t f2f7_2 = f2_2 * (int64_t) f7; + int64_t f2f8_38 = f2_2 * (int64_t) f8_19; + int64_t f2f9_38 = f2 * (int64_t) f9_38; + int64_t f3f3_2 = f3_2 * (int64_t) f3; + int64_t f3f4_2 = f3_2 * (int64_t) f4; + int64_t f3f5_4 = f3_2 * (int64_t) f5_2; + int64_t f3f6_2 = f3_2 * (int64_t) f6; + int64_t f3f7_76 = f3_2 * (int64_t) f7_38; + int64_t f3f8_38 = f3_2 * (int64_t) f8_19; + int64_t f3f9_76 = f3_2 * (int64_t) f9_38; + int64_t f4f4 = f4 * (int64_t) f4; + int64_t f4f5_2 = f4_2 * (int64_t) f5; + int64_t f4f6_38 = f4_2 * (int64_t) f6_19; + int64_t f4f7_38 = f4 * (int64_t) f7_38; + int64_t f4f8_38 = f4_2 * (int64_t) f8_19; + int64_t f4f9_38 = f4 * (int64_t) f9_38; + int64_t f5f5_38 = f5 * (int64_t) f5_38; + int64_t f5f6_38 = f5_2 * (int64_t) f6_19; + int64_t f5f7_76 = f5_2 * (int64_t) f7_38; + int64_t f5f8_38 = f5_2 * (int64_t) f8_19; + int64_t f5f9_76 = f5_2 * (int64_t) f9_38; + int64_t f6f6_19 = f6 * (int64_t) f6_19; + int64_t f6f7_38 = f6 * (int64_t) f7_38; + int64_t f6f8_38 = f6_2 * (int64_t) f8_19; + int64_t f6f9_38 = f6 * (int64_t) f9_38; + int64_t f7f7_38 = f7 * (int64_t) f7_38; + int64_t f7f8_38 = f7_2 * (int64_t) f8_19; + int64_t f7f9_76 = f7_2 * (int64_t) f9_38; + int64_t f8f8_19 = f8 * (int64_t) f8_19; + int64_t f8f9_38 = f8 * (int64_t) f9_38; + int64_t f9f9_38 = f9 * (int64_t) f9_38; + int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38; + int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38; + int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19; + int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38; + int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38; + int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38; + int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19; + int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38; + int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38; + int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry1 = (h1 + (int64_t) (1 << 24)) >> 25; + h2 += carry1; + h1 -= carry1 << 25; + carry5 = (h5 + (int64_t) (1 << 24)) >> 25; + h6 += carry5; + h5 -= carry5 << 25; + carry2 = (h2 + (int64_t) (1 << 25)) >> 26; + h3 += carry2; + h2 -= carry2 << 26; + carry6 = (h6 + (int64_t) (1 << 25)) >> 26; + h7 += carry6; + h6 -= carry6 << 26; + carry3 = (h3 + (int64_t) (1 << 24)) >> 25; + h4 += carry3; + h3 -= carry3 << 25; + carry7 = (h7 + (int64_t) (1 << 24)) >> 25; + h8 += carry7; + h7 -= carry7 << 25; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry8 = (h8 + (int64_t) (1 << 25)) >> 26; + h9 += carry8; + h8 -= carry8 << 26; + carry9 = (h9 + (int64_t) (1 << 24)) >> 25; + h0 += carry9 * 19; + h9 -= carry9 << 25; + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + h[0] = (int32_t) h0; + h[1] = (int32_t) h1; + h[2] = (int32_t) h2; + h[3] = (int32_t) h3; + h[4] = (int32_t) h4; + h[5] = (int32_t) h5; + h[6] = (int32_t) h6; + h[7] = (int32_t) h7; + h[8] = (int32_t) h8; + h[9] = (int32_t) h9; +} + + +/* +h = 2 * f * f +Can overlap h with f. + +Preconditions: + |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. + +Postconditions: + |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. +*/ + +/* +See fe_mul.c for discussion of implementation strategy. +*/ + +void fe_sq2(fe h, const fe f) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t f0_2 = 2 * f0; + int32_t f1_2 = 2 * f1; + int32_t f2_2 = 2 * f2; + int32_t f3_2 = 2 * f3; + int32_t f4_2 = 2 * f4; + int32_t f5_2 = 2 * f5; + int32_t f6_2 = 2 * f6; + int32_t f7_2 = 2 * f7; + int32_t f5_38 = 38 * f5; /* 1.959375*2^30 */ + int32_t f6_19 = 19 * f6; /* 1.959375*2^30 */ + int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */ + int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */ + int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */ + int64_t f0f0 = f0 * (int64_t) f0; + int64_t f0f1_2 = f0_2 * (int64_t) f1; + int64_t f0f2_2 = f0_2 * (int64_t) f2; + int64_t f0f3_2 = f0_2 * (int64_t) f3; + int64_t f0f4_2 = f0_2 * (int64_t) f4; + int64_t f0f5_2 = f0_2 * (int64_t) f5; + int64_t f0f6_2 = f0_2 * (int64_t) f6; + int64_t f0f7_2 = f0_2 * (int64_t) f7; + int64_t f0f8_2 = f0_2 * (int64_t) f8; + int64_t f0f9_2 = f0_2 * (int64_t) f9; + int64_t f1f1_2 = f1_2 * (int64_t) f1; + int64_t f1f2_2 = f1_2 * (int64_t) f2; + int64_t f1f3_4 = f1_2 * (int64_t) f3_2; + int64_t f1f4_2 = f1_2 * (int64_t) f4; + int64_t f1f5_4 = f1_2 * (int64_t) f5_2; + int64_t f1f6_2 = f1_2 * (int64_t) f6; + int64_t f1f7_4 = f1_2 * (int64_t) f7_2; + int64_t f1f8_2 = f1_2 * (int64_t) f8; + int64_t f1f9_76 = f1_2 * (int64_t) f9_38; + int64_t f2f2 = f2 * (int64_t) f2; + int64_t f2f3_2 = f2_2 * (int64_t) f3; + int64_t f2f4_2 = f2_2 * (int64_t) f4; + int64_t f2f5_2 = f2_2 * (int64_t) f5; + int64_t f2f6_2 = f2_2 * (int64_t) f6; + int64_t f2f7_2 = f2_2 * (int64_t) f7; + int64_t f2f8_38 = f2_2 * (int64_t) f8_19; + int64_t f2f9_38 = f2 * (int64_t) f9_38; + int64_t f3f3_2 = f3_2 * (int64_t) f3; + int64_t f3f4_2 = f3_2 * (int64_t) f4; + int64_t f3f5_4 = f3_2 * (int64_t) f5_2; + int64_t f3f6_2 = f3_2 * (int64_t) f6; + int64_t f3f7_76 = f3_2 * (int64_t) f7_38; + int64_t f3f8_38 = f3_2 * (int64_t) f8_19; + int64_t f3f9_76 = f3_2 * (int64_t) f9_38; + int64_t f4f4 = f4 * (int64_t) f4; + int64_t f4f5_2 = f4_2 * (int64_t) f5; + int64_t f4f6_38 = f4_2 * (int64_t) f6_19; + int64_t f4f7_38 = f4 * (int64_t) f7_38; + int64_t f4f8_38 = f4_2 * (int64_t) f8_19; + int64_t f4f9_38 = f4 * (int64_t) f9_38; + int64_t f5f5_38 = f5 * (int64_t) f5_38; + int64_t f5f6_38 = f5_2 * (int64_t) f6_19; + int64_t f5f7_76 = f5_2 * (int64_t) f7_38; + int64_t f5f8_38 = f5_2 * (int64_t) f8_19; + int64_t f5f9_76 = f5_2 * (int64_t) f9_38; + int64_t f6f6_19 = f6 * (int64_t) f6_19; + int64_t f6f7_38 = f6 * (int64_t) f7_38; + int64_t f6f8_38 = f6_2 * (int64_t) f8_19; + int64_t f6f9_38 = f6 * (int64_t) f9_38; + int64_t f7f7_38 = f7 * (int64_t) f7_38; + int64_t f7f8_38 = f7_2 * (int64_t) f8_19; + int64_t f7f9_76 = f7_2 * (int64_t) f9_38; + int64_t f8f8_19 = f8 * (int64_t) f8_19; + int64_t f8f9_38 = f8 * (int64_t) f9_38; + int64_t f9f9_38 = f9 * (int64_t) f9_38; + int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38; + int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38; + int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19; + int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38; + int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38; + int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38; + int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19; + int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38; + int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38; + int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + h0 += h0; + h1 += h1; + h2 += h2; + h3 += h3; + h4 += h4; + h5 += h5; + h6 += h6; + h7 += h7; + h8 += h8; + h9 += h9; + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry1 = (h1 + (int64_t) (1 << 24)) >> 25; + h2 += carry1; + h1 -= carry1 << 25; + carry5 = (h5 + (int64_t) (1 << 24)) >> 25; + h6 += carry5; + h5 -= carry5 << 25; + carry2 = (h2 + (int64_t) (1 << 25)) >> 26; + h3 += carry2; + h2 -= carry2 << 26; + carry6 = (h6 + (int64_t) (1 << 25)) >> 26; + h7 += carry6; + h6 -= carry6 << 26; + carry3 = (h3 + (int64_t) (1 << 24)) >> 25; + h4 += carry3; + h3 -= carry3 << 25; + carry7 = (h7 + (int64_t) (1 << 24)) >> 25; + h8 += carry7; + h7 -= carry7 << 25; + carry4 = (h4 + (int64_t) (1 << 25)) >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry8 = (h8 + (int64_t) (1 << 25)) >> 26; + h9 += carry8; + h8 -= carry8 << 26; + carry9 = (h9 + (int64_t) (1 << 24)) >> 25; + h0 += carry9 * 19; + h9 -= carry9 << 25; + carry0 = (h0 + (int64_t) (1 << 25)) >> 26; + h1 += carry0; + h0 -= carry0 << 26; + h[0] = (int32_t) h0; + h[1] = (int32_t) h1; + h[2] = (int32_t) h2; + h[3] = (int32_t) h3; + h[4] = (int32_t) h4; + h[5] = (int32_t) h5; + h[6] = (int32_t) h6; + h[7] = (int32_t) h7; + h[8] = (int32_t) h8; + h[9] = (int32_t) h9; +} + + +/* +h = f - g +Can overlap h with f or g. + +Preconditions: + |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. + +Postconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +*/ + +void fe_sub(fe h, const fe f, const fe g) { + int32_t f0 = f[0]; + int32_t f1 = f[1]; + int32_t f2 = f[2]; + int32_t f3 = f[3]; + int32_t f4 = f[4]; + int32_t f5 = f[5]; + int32_t f6 = f[6]; + int32_t f7 = f[7]; + int32_t f8 = f[8]; + int32_t f9 = f[9]; + int32_t g0 = g[0]; + int32_t g1 = g[1]; + int32_t g2 = g[2]; + int32_t g3 = g[3]; + int32_t g4 = g[4]; + int32_t g5 = g[5]; + int32_t g6 = g[6]; + int32_t g7 = g[7]; + int32_t g8 = g[8]; + int32_t g9 = g[9]; + int32_t h0 = f0 - g0; + int32_t h1 = f1 - g1; + int32_t h2 = f2 - g2; + int32_t h3 = f3 - g3; + int32_t h4 = f4 - g4; + int32_t h5 = f5 - g5; + int32_t h6 = f6 - g6; + int32_t h7 = f7 - g7; + int32_t h8 = f8 - g8; + int32_t h9 = f9 - g9; + + h[0] = h0; + h[1] = h1; + h[2] = h2; + h[3] = h3; + h[4] = h4; + h[5] = h5; + h[6] = h6; + h[7] = h7; + h[8] = h8; + h[9] = h9; +} + + + +/* +Preconditions: + |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. + +Write p=2^255-19; q=floor(h/p). +Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))). + +Proof: + Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4. + Also have |h-2^230 h9|<2^231 so |19 2^(-255)(h-2^230 h9)|<1/4. + + Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9). + Then 0> 25; + q = (h0 + q) >> 26; + q = (h1 + q) >> 25; + q = (h2 + q) >> 26; + q = (h3 + q) >> 25; + q = (h4 + q) >> 26; + q = (h5 + q) >> 25; + q = (h6 + q) >> 26; + q = (h7 + q) >> 25; + q = (h8 + q) >> 26; + q = (h9 + q) >> 25; + /* Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. */ + h0 += 19 * q; + /* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */ + carry0 = h0 >> 26; + h1 += carry0; + h0 -= carry0 << 26; + carry1 = h1 >> 25; + h2 += carry1; + h1 -= carry1 << 25; + carry2 = h2 >> 26; + h3 += carry2; + h2 -= carry2 << 26; + carry3 = h3 >> 25; + h4 += carry3; + h3 -= carry3 << 25; + carry4 = h4 >> 26; + h5 += carry4; + h4 -= carry4 << 26; + carry5 = h5 >> 25; + h6 += carry5; + h5 -= carry5 << 25; + carry6 = h6 >> 26; + h7 += carry6; + h6 -= carry6 << 26; + carry7 = h7 >> 25; + h8 += carry7; + h7 -= carry7 << 25; + carry8 = h8 >> 26; + h9 += carry8; + h8 -= carry8 << 26; + carry9 = h9 >> 25; + h9 -= carry9 << 25; + + /* h10 = carry9 */ + /* + Goal: Output h0+...+2^255 h10-2^255 q, which is between 0 and 2^255-20. + Have h0+...+2^230 h9 between 0 and 2^255-1; + evidently 2^255 h10-2^255 q = 0. + Goal: Output h0+...+2^230 h9. + */ + s[0] = (unsigned char) (h0 >> 0); + s[1] = (unsigned char) (h0 >> 8); + s[2] = (unsigned char) (h0 >> 16); + s[3] = (unsigned char) ((h0 >> 24) | (h1 << 2)); + s[4] = (unsigned char) (h1 >> 6); + s[5] = (unsigned char) (h1 >> 14); + s[6] = (unsigned char) ((h1 >> 22) | (h2 << 3)); + s[7] = (unsigned char) (h2 >> 5); + s[8] = (unsigned char) (h2 >> 13); + s[9] = (unsigned char) ((h2 >> 21) | (h3 << 5)); + s[10] = (unsigned char) (h3 >> 3); + s[11] = (unsigned char) (h3 >> 11); + s[12] = (unsigned char) ((h3 >> 19) | (h4 << 6)); + s[13] = (unsigned char) (h4 >> 2); + s[14] = (unsigned char) (h4 >> 10); + s[15] = (unsigned char) (h4 >> 18); + s[16] = (unsigned char) (h5 >> 0); + s[17] = (unsigned char) (h5 >> 8); + s[18] = (unsigned char) (h5 >> 16); + s[19] = (unsigned char) ((h5 >> 24) | (h6 << 1)); + s[20] = (unsigned char) (h6 >> 7); + s[21] = (unsigned char) (h6 >> 15); + s[22] = (unsigned char) ((h6 >> 23) | (h7 << 3)); + s[23] = (unsigned char) (h7 >> 5); + s[24] = (unsigned char) (h7 >> 13); + s[25] = (unsigned char) ((h7 >> 21) | (h8 << 4)); + s[26] = (unsigned char) (h8 >> 4); + s[27] = (unsigned char) (h8 >> 12); + s[28] = (unsigned char) ((h8 >> 20) | (h9 << 6)); + s[29] = (unsigned char) (h9 >> 2); + s[30] = (unsigned char) (h9 >> 10); + s[31] = (unsigned char) (h9 >> 18); +} diff --git a/ed25519/src/fe.h b/ed25519/src/fe.h new file mode 100644 index 0000000..b4b62d2 --- /dev/null +++ b/ed25519/src/fe.h @@ -0,0 +1,41 @@ +#ifndef FE_H +#define FE_H + +#include "fixedint.h" + + +/* + fe means field element. + Here the field is \Z/(2^255-19). + An element t, entries t[0]...t[9], represents the integer + t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9]. + Bounds on each t[i] vary depending on context. +*/ + + +typedef int32_t fe[10]; + + +void fe_0(fe h); +void fe_1(fe h); + +void fe_frombytes(fe h, const unsigned char *s); +void fe_tobytes(unsigned char *s, const fe h); + +void fe_copy(fe h, const fe f); +int fe_isnegative(const fe f); +int fe_isnonzero(const fe f); +void fe_cmov(fe f, const fe g, unsigned int b); +void fe_cswap(fe f, fe g, unsigned int b); + +void fe_neg(fe h, const fe f); +void fe_add(fe h, const fe f, const fe g); +void fe_invert(fe out, const fe z); +void fe_sq(fe h, const fe f); +void fe_sq2(fe h, const fe f); +void fe_mul(fe h, const fe f, const fe g); +void fe_mul121666(fe h, fe f); +void fe_pow22523(fe out, const fe z); +void fe_sub(fe h, const fe f, const fe g); + +#endif diff --git a/ed25519/src/fixedint.h b/ed25519/src/fixedint.h new file mode 100644 index 0000000..1a8745b --- /dev/null +++ b/ed25519/src/fixedint.h @@ -0,0 +1,72 @@ +/* + Portable header to provide the 32 and 64 bits type. + + Not a compatible replacement for , do not blindly use it as such. +*/ + +#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__WATCOMC__) && (defined(_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined(__UINT_FAST64_TYPE__)) )) && !defined(FIXEDINT_H_INCLUDED) + #include + #define FIXEDINT_H_INCLUDED + + #if defined(__WATCOMC__) && __WATCOMC__ >= 1250 && !defined(UINT64_C) + #include + #define UINT64_C(x) (x + (UINT64_MAX - UINT64_MAX)) + #endif +#endif + + +#ifndef FIXEDINT_H_INCLUDED + #define FIXEDINT_H_INCLUDED + + #include + + /* (u)int32_t */ + #ifndef uint32_t + #if (ULONG_MAX == 0xffffffffUL) + typedef unsigned long uint32_t; + #elif (UINT_MAX == 0xffffffffUL) + typedef unsigned int uint32_t; + #elif (USHRT_MAX == 0xffffffffUL) + typedef unsigned short uint32_t; + #endif + #endif + + + #ifndef int32_t + #if (LONG_MAX == 0x7fffffffL) + typedef signed long int32_t; + #elif (INT_MAX == 0x7fffffffL) + typedef signed int int32_t; + #elif (SHRT_MAX == 0x7fffffffL) + typedef signed short int32_t; + #endif + #endif + + + /* (u)int64_t */ + #if (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC__ && __STDC_VERSION__ >= 199901L) + typedef long long int64_t; + typedef unsigned long long uint64_t; + + #define UINT64_C(v) v ##ULL + #define INT64_C(v) v ##LL + #elif defined(__GNUC__) + __extension__ typedef long long int64_t; + __extension__ typedef unsigned long long uint64_t; + + #define UINT64_C(v) v ##ULL + #define INT64_C(v) v ##LL + #elif defined(__MWERKS__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__APPLE_CC__) || defined(_LONG_LONG) || defined(_CRAYC) + typedef long long int64_t; + typedef unsigned long long uint64_t; + + #define UINT64_C(v) v ##ULL + #define INT64_C(v) v ##LL + #elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined(__BORLANDC__) && __BORLANDC__ > 0x460) || defined(__alpha) || defined(__DECC) + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; + + #define UINT64_C(v) v ##UI64 + #define INT64_C(v) v ##I64 + #endif +#endif diff --git a/ed25519/src/ge.c b/ed25519/src/ge.c new file mode 100644 index 0000000..87c691b --- /dev/null +++ b/ed25519/src/ge.c @@ -0,0 +1,467 @@ +#include "ge.h" +#include "precomp_data.h" + + +/* +r = p + q +*/ + +void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q) { + fe t0; + fe_add(r->X, p->Y, p->X); + fe_sub(r->Y, p->Y, p->X); + fe_mul(r->Z, r->X, q->YplusX); + fe_mul(r->Y, r->Y, q->YminusX); + fe_mul(r->T, q->T2d, p->T); + fe_mul(r->X, p->Z, q->Z); + fe_add(t0, r->X, r->X); + fe_sub(r->X, r->Z, r->Y); + fe_add(r->Y, r->Z, r->Y); + fe_add(r->Z, t0, r->T); + fe_sub(r->T, t0, r->T); +} + + +static void slide(signed char *r, const unsigned char *a) { + int i; + int b; + int k; + + for (i = 0; i < 256; ++i) { + r[i] = 1 & (a[i >> 3] >> (i & 7)); + } + + for (i = 0; i < 256; ++i) + if (r[i]) { + for (b = 1; b <= 6 && i + b < 256; ++b) { + if (r[i + b]) { + if (r[i] + (r[i + b] << b) <= 15) { + r[i] += r[i + b] << b; + r[i + b] = 0; + } else if (r[i] - (r[i + b] << b) >= -15) { + r[i] -= r[i + b] << b; + + for (k = i + b; k < 256; ++k) { + if (!r[k]) { + r[k] = 1; + break; + } + + r[k] = 0; + } + } else { + break; + } + } + } + } +} + +/* +r = a * A + b * B +where a = a[0]+256*a[1]+...+256^31 a[31]. +and b = b[0]+256*b[1]+...+256^31 b[31]. +B is the Ed25519 base point (x,4/5) with x positive. +*/ + +void ge_double_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A, const unsigned char *b) { + signed char aslide[256]; + signed char bslide[256]; + ge_cached Ai[8]; /* A,3A,5A,7A,9A,11A,13A,15A */ + ge_p1p1 t; + ge_p3 u; + ge_p3 A2; + int i; + slide(aslide, a); + slide(bslide, b); + ge_p3_to_cached(&Ai[0], A); + ge_p3_dbl(&t, A); + ge_p1p1_to_p3(&A2, &t); + ge_add(&t, &A2, &Ai[0]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[1], &u); + ge_add(&t, &A2, &Ai[1]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[2], &u); + ge_add(&t, &A2, &Ai[2]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[3], &u); + ge_add(&t, &A2, &Ai[3]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[4], &u); + ge_add(&t, &A2, &Ai[4]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[5], &u); + ge_add(&t, &A2, &Ai[5]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[6], &u); + ge_add(&t, &A2, &Ai[6]); + ge_p1p1_to_p3(&u, &t); + ge_p3_to_cached(&Ai[7], &u); + ge_p2_0(r); + + for (i = 255; i >= 0; --i) { + if (aslide[i] || bslide[i]) { + break; + } + } + + for (; i >= 0; --i) { + ge_p2_dbl(&t, r); + + if (aslide[i] > 0) { + ge_p1p1_to_p3(&u, &t); + ge_add(&t, &u, &Ai[aslide[i] / 2]); + } else if (aslide[i] < 0) { + ge_p1p1_to_p3(&u, &t); + ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]); + } + + if (bslide[i] > 0) { + ge_p1p1_to_p3(&u, &t); + ge_madd(&t, &u, &Bi[bslide[i] / 2]); + } else if (bslide[i] < 0) { + ge_p1p1_to_p3(&u, &t); + ge_msub(&t, &u, &Bi[(-bslide[i]) / 2]); + } + + ge_p1p1_to_p2(r, &t); + } +} + + +static const fe d = { + -10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116 +}; + +static const fe sqrtm1 = { + -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482 +}; + +int ge_frombytes_negate_vartime(ge_p3 *h, const unsigned char *s) { + fe u; + fe v; + fe v3; + fe vxx; + fe check; + fe_frombytes(h->Y, s); + fe_1(h->Z); + fe_sq(u, h->Y); + fe_mul(v, u, d); + fe_sub(u, u, h->Z); /* u = y^2-1 */ + fe_add(v, v, h->Z); /* v = dy^2+1 */ + fe_sq(v3, v); + fe_mul(v3, v3, v); /* v3 = v^3 */ + fe_sq(h->X, v3); + fe_mul(h->X, h->X, v); + fe_mul(h->X, h->X, u); /* x = uv^7 */ + fe_pow22523(h->X, h->X); /* x = (uv^7)^((q-5)/8) */ + fe_mul(h->X, h->X, v3); + fe_mul(h->X, h->X, u); /* x = uv^3(uv^7)^((q-5)/8) */ + fe_sq(vxx, h->X); + fe_mul(vxx, vxx, v); + fe_sub(check, vxx, u); /* vx^2-u */ + + if (fe_isnonzero(check)) { + fe_add(check, vxx, u); /* vx^2+u */ + + if (fe_isnonzero(check)) { + return -1; + } + + fe_mul(h->X, h->X, sqrtm1); + } + + if (fe_isnegative(h->X) == (s[31] >> 7)) { + fe_neg(h->X, h->X); + } + + fe_mul(h->T, h->X, h->Y); + return 0; +} + + +/* +r = p + q +*/ + +void ge_madd(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q) { + fe t0; + fe_add(r->X, p->Y, p->X); + fe_sub(r->Y, p->Y, p->X); + fe_mul(r->Z, r->X, q->yplusx); + fe_mul(r->Y, r->Y, q->yminusx); + fe_mul(r->T, q->xy2d, p->T); + fe_add(t0, p->Z, p->Z); + fe_sub(r->X, r->Z, r->Y); + fe_add(r->Y, r->Z, r->Y); + fe_add(r->Z, t0, r->T); + fe_sub(r->T, t0, r->T); +} + + +/* +r = p - q +*/ + +void ge_msub(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q) { + fe t0; + + fe_add(r->X, p->Y, p->X); + fe_sub(r->Y, p->Y, p->X); + fe_mul(r->Z, r->X, q->yminusx); + fe_mul(r->Y, r->Y, q->yplusx); + fe_mul(r->T, q->xy2d, p->T); + fe_add(t0, p->Z, p->Z); + fe_sub(r->X, r->Z, r->Y); + fe_add(r->Y, r->Z, r->Y); + fe_sub(r->Z, t0, r->T); + fe_add(r->T, t0, r->T); +} + + +/* +r = p +*/ + +void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p) { + fe_mul(r->X, p->X, p->T); + fe_mul(r->Y, p->Y, p->Z); + fe_mul(r->Z, p->Z, p->T); +} + + + +/* +r = p +*/ + +void ge_p1p1_to_p3(ge_p3 *r, const ge_p1p1 *p) { + fe_mul(r->X, p->X, p->T); + fe_mul(r->Y, p->Y, p->Z); + fe_mul(r->Z, p->Z, p->T); + fe_mul(r->T, p->X, p->Y); +} + + +void ge_p2_0(ge_p2 *h) { + fe_0(h->X); + fe_1(h->Y); + fe_1(h->Z); +} + + + +/* +r = 2 * p +*/ + +void ge_p2_dbl(ge_p1p1 *r, const ge_p2 *p) { + fe t0; + + fe_sq(r->X, p->X); + fe_sq(r->Z, p->Y); + fe_sq2(r->T, p->Z); + fe_add(r->Y, p->X, p->Y); + fe_sq(t0, r->Y); + fe_add(r->Y, r->Z, r->X); + fe_sub(r->Z, r->Z, r->X); + fe_sub(r->X, t0, r->Y); + fe_sub(r->T, r->T, r->Z); +} + + +void ge_p3_0(ge_p3 *h) { + fe_0(h->X); + fe_1(h->Y); + fe_1(h->Z); + fe_0(h->T); +} + + +/* +r = 2 * p +*/ + +void ge_p3_dbl(ge_p1p1 *r, const ge_p3 *p) { + ge_p2 q; + ge_p3_to_p2(&q, p); + ge_p2_dbl(r, &q); +} + + + +/* +r = p +*/ + +static const fe d2 = { + -21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199 +}; + +void ge_p3_to_cached(ge_cached *r, const ge_p3 *p) { + fe_add(r->YplusX, p->Y, p->X); + fe_sub(r->YminusX, p->Y, p->X); + fe_copy(r->Z, p->Z); + fe_mul(r->T2d, p->T, d2); +} + + +/* +r = p +*/ + +void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p) { + fe_copy(r->X, p->X); + fe_copy(r->Y, p->Y); + fe_copy(r->Z, p->Z); +} + + +void ge_p3_tobytes(unsigned char *s, const ge_p3 *h) { + fe recip; + fe x; + fe y; + fe_invert(recip, h->Z); + fe_mul(x, h->X, recip); + fe_mul(y, h->Y, recip); + fe_tobytes(s, y); + s[31] ^= fe_isnegative(x) << 7; +} + + +static unsigned char equal(signed char b, signed char c) { + unsigned char ub = b; + unsigned char uc = c; + unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */ + uint64_t y = x; /* 0: yes; 1..255: no */ + y -= 1; /* large: yes; 0..254: no */ + y >>= 63; /* 1: yes; 0: no */ + return (unsigned char) y; +} + +static unsigned char negative(signed char b) { + uint64_t x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */ + x >>= 63; /* 1: yes; 0: no */ + return (unsigned char) x; +} + +static void cmov(ge_precomp *t, const ge_precomp *u, unsigned char b) { + fe_cmov(t->yplusx, u->yplusx, b); + fe_cmov(t->yminusx, u->yminusx, b); + fe_cmov(t->xy2d, u->xy2d, b); +} + + +static void select(ge_precomp *t, int pos, signed char b) { + ge_precomp minust; + unsigned char bnegative = negative(b); + unsigned char babs = b - (((-bnegative) & b) << 1); + fe_1(t->yplusx); + fe_1(t->yminusx); + fe_0(t->xy2d); + cmov(t, &base[pos][0], equal(babs, 1)); + cmov(t, &base[pos][1], equal(babs, 2)); + cmov(t, &base[pos][2], equal(babs, 3)); + cmov(t, &base[pos][3], equal(babs, 4)); + cmov(t, &base[pos][4], equal(babs, 5)); + cmov(t, &base[pos][5], equal(babs, 6)); + cmov(t, &base[pos][6], equal(babs, 7)); + cmov(t, &base[pos][7], equal(babs, 8)); + fe_copy(minust.yplusx, t->yminusx); + fe_copy(minust.yminusx, t->yplusx); + fe_neg(minust.xy2d, t->xy2d); + cmov(t, &minust, bnegative); +} + +/* +h = a * B +where a = a[0]+256*a[1]+...+256^31 a[31] +B is the Ed25519 base point (x,4/5) with x positive. + +Preconditions: + a[31] <= 127 +*/ + +void ge_scalarmult_base(ge_p3 *h, const unsigned char *a) { + signed char e[64]; + signed char carry; + ge_p1p1 r; + ge_p2 s; + ge_precomp t; + int i; + + for (i = 0; i < 32; ++i) { + e[2 * i + 0] = (a[i] >> 0) & 15; + e[2 * i + 1] = (a[i] >> 4) & 15; + } + + /* each e[i] is between 0 and 15 */ + /* e[63] is between 0 and 7 */ + carry = 0; + + for (i = 0; i < 63; ++i) { + e[i] += carry; + carry = e[i] + 8; + carry >>= 4; + e[i] -= carry << 4; + } + + e[63] += carry; + /* each e[i] is between -8 and 8 */ + ge_p3_0(h); + + for (i = 1; i < 64; i += 2) { + select(&t, i / 2, e[i]); + ge_madd(&r, h, &t); + ge_p1p1_to_p3(h, &r); + } + + ge_p3_dbl(&r, h); + ge_p1p1_to_p2(&s, &r); + ge_p2_dbl(&r, &s); + ge_p1p1_to_p2(&s, &r); + ge_p2_dbl(&r, &s); + ge_p1p1_to_p2(&s, &r); + ge_p2_dbl(&r, &s); + ge_p1p1_to_p3(h, &r); + + for (i = 0; i < 64; i += 2) { + select(&t, i / 2, e[i]); + ge_madd(&r, h, &t); + ge_p1p1_to_p3(h, &r); + } +} + + +/* +r = p - q +*/ + +void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q) { + fe t0; + + fe_add(r->X, p->Y, p->X); + fe_sub(r->Y, p->Y, p->X); + fe_mul(r->Z, r->X, q->YminusX); + fe_mul(r->Y, r->Y, q->YplusX); + fe_mul(r->T, q->T2d, p->T); + fe_mul(r->X, p->Z, q->Z); + fe_add(t0, r->X, r->X); + fe_sub(r->X, r->Z, r->Y); + fe_add(r->Y, r->Z, r->Y); + fe_sub(r->Z, t0, r->T); + fe_add(r->T, t0, r->T); +} + + +void ge_tobytes(unsigned char *s, const ge_p2 *h) { + fe recip; + fe x; + fe y; + fe_invert(recip, h->Z); + fe_mul(x, h->X, recip); + fe_mul(y, h->Y, recip); + fe_tobytes(s, y); + s[31] ^= fe_isnegative(x) << 7; +} diff --git a/ed25519/src/ge.h b/ed25519/src/ge.h new file mode 100644 index 0000000..17fde2d --- /dev/null +++ b/ed25519/src/ge.h @@ -0,0 +1,74 @@ +#ifndef GE_H +#define GE_H + +#include "fe.h" + + +/* +ge means group element. + +Here the group is the set of pairs (x,y) of field elements (see fe.h) +satisfying -x^2 + y^2 = 1 + d x^2y^2 +where d = -121665/121666. + +Representations: + ge_p2 (projective): (X:Y:Z) satisfying x=X/Z, y=Y/Z + ge_p3 (extended): (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT + ge_p1p1 (completed): ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T + ge_precomp (Duif): (y+x,y-x,2dxy) +*/ + +typedef struct { + fe X; + fe Y; + fe Z; +} ge_p2; + +typedef struct { + fe X; + fe Y; + fe Z; + fe T; +} ge_p3; + +typedef struct { + fe X; + fe Y; + fe Z; + fe T; +} ge_p1p1; + +typedef struct { + fe yplusx; + fe yminusx; + fe xy2d; +} ge_precomp; + +typedef struct { + fe YplusX; + fe YminusX; + fe Z; + fe T2d; +} ge_cached; + +void ge_p3_tobytes(unsigned char *s, const ge_p3 *h); +void ge_tobytes(unsigned char *s, const ge_p2 *h); +int ge_frombytes_negate_vartime(ge_p3 *h, const unsigned char *s); + +void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q); +void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q); +void ge_double_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A, const unsigned char *b); +void ge_madd(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q); +void ge_msub(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q); +void ge_scalarmult_base(ge_p3 *h, const unsigned char *a); + +void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p); +void ge_p1p1_to_p3(ge_p3 *r, const ge_p1p1 *p); +void ge_p2_0(ge_p2 *h); +void ge_p2_dbl(ge_p1p1 *r, const ge_p2 *p); +void ge_p3_0(ge_p3 *h); +void ge_p3_dbl(ge_p1p1 *r, const ge_p3 *p); +void ge_p3_to_cached(ge_cached *r, const ge_p3 *p); +void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p); + +#endif diff --git a/ed25519/src/key_exchange.c b/ed25519/src/key_exchange.c new file mode 100644 index 0000000..c1b0765 --- /dev/null +++ b/ed25519/src/key_exchange.c @@ -0,0 +1,79 @@ +#include "ed25519.h" +#include "fe.h" + +void ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key_write, const unsigned char *private_key_write) { + unsigned char e[32]; + unsigned int i; + + fe x1; + fe x2; + fe z2; + fe x3; + fe z3; + fe tmp0; + fe tmp1; + + int pos; + unsigned int swap; + unsigned int b; + + /* copy the private key and make sure it's valid */ + for (i = 0; i < 32; ++i) { + e[i] = private_key_write[i]; + } + + e[0] &= 248; + e[31] &= 63; + e[31] |= 64; + + /* unpack the public key and convert edwards to montgomery */ + /* due to CodesInChaos: montgomeryX = (edwardsY + 1)*inverse(1 - edwardsY) mod p */ + fe_frombytes(x1, public_key_write); + fe_1(tmp1); + fe_add(tmp0, x1, tmp1); + fe_sub(tmp1, tmp1, x1); + fe_invert(tmp1, tmp1); + fe_mul(x1, tmp0, tmp1); + + fe_1(x2); + fe_0(z2); + fe_copy(x3, x1); + fe_1(z3); + + swap = 0; + for (pos = 254; pos >= 0; --pos) { + b = e[pos / 8] >> (pos & 7); + b &= 1; + swap ^= b; + fe_cswap(x2, x3, swap); + fe_cswap(z2, z3, swap); + swap = b; + + /* from montgomery.h */ + fe_sub(tmp0, x3, z3); + fe_sub(tmp1, x2, z2); + fe_add(x2, x2, z2); + fe_add(z2, x3, z3); + fe_mul(z3, tmp0, x2); + fe_mul(z2, z2, tmp1); + fe_sq(tmp0, tmp1); + fe_sq(tmp1, x2); + fe_add(x3, z3, z2); + fe_sub(z2, z3, z2); + fe_mul(x2, tmp1, tmp0); + fe_sub(tmp1, tmp1, tmp0); + fe_sq(z2, z2); + fe_mul121666(z3, tmp1); + fe_sq(x3, x3); + fe_add(tmp0, tmp0, z3); + fe_mul(z3, x1, z2); + fe_mul(z2, tmp1, tmp0); + } + + fe_cswap(x2, x3, swap); + fe_cswap(z2, z3, swap); + + fe_invert(z2, z2); + fe_mul(x2, x2, z2); + fe_tobytes(shared_secret, x2); +} diff --git a/ed25519/src/keypair.c b/ed25519/src/keypair.c new file mode 100644 index 0000000..7f8cb0f --- /dev/null +++ b/ed25519/src/keypair.c @@ -0,0 +1,16 @@ +#include "ed25519.h" +#include "sha512.h" +#include "ge.h" + + +void ed25519_create_keypair(unsigned char *public_key_write, unsigned char *private_key_write, const unsigned char *seed) { + ge_p3 A; + + sha512(seed, 32, private_key_write); + private_key_write[0] &= 248; + private_key_write[31] &= 63; + private_key_write[31] |= 64; + + ge_scalarmult_base(&A, private_key_write); + ge_p3_tobytes(public_key_write, &A); +} diff --git a/ed25519/src/precomp_data.h b/ed25519/src/precomp_data.h new file mode 100644 index 0000000..ff23986 --- /dev/null +++ b/ed25519/src/precomp_data.h @@ -0,0 +1,1391 @@ +static const ge_precomp Bi[8] = { + { + { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605 }, + { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378 }, + { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546 }, + }, + { + { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024 }, + { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574 }, + { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357 }, + }, + { + { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380 }, + { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306 }, + { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942 }, + }, + { + { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766 }, + { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701 }, + { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300 }, + }, + { + { -22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877 }, + { -6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951 }, + { 4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784 }, + }, + { + { -25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436 }, + { 25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918 }, + { 23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877 }, + }, + { + { -33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800 }, + { -25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305 }, + { -13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300 }, + }, + { + { -3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876 }, + { -24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619 }, + { -3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683 }, + }, +}; + + +/* base[i][j] = (j+1)*256^i*B */ +static const ge_precomp base[32][8] = { + { + { + { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605 }, + { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378 }, + { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546 }, + }, + { + { -12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303 }, + { -21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081 }, + { 26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697 }, + }, + { + { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024 }, + { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574 }, + { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357 }, + }, + { + { -17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540 }, + { 23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397 }, + { 7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325 }, + }, + { + { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380 }, + { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306 }, + { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942 }, + }, + { + { -15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777 }, + { -8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737 }, + { -18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652 }, + }, + { + { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766 }, + { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701 }, + { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300 }, + }, + { + { 14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726 }, + { -7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955 }, + { 27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425 }, + }, + }, + { + { + { -13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171 }, + { 27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510 }, + { 17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660 }, + }, + { + { -10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639 }, + { 29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963 }, + { 5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950 }, + }, + { + { -27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568 }, + { 12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335 }, + { 25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628 }, + }, + { + { -26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007 }, + { -2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772 }, + { -22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653 }, + }, + { + { 2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567 }, + { 13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686 }, + { 21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372 }, + }, + { + { -13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887 }, + { -23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954 }, + { -29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953 }, + }, + { + { 24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833 }, + { -16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532 }, + { -22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876 }, + }, + { + { 2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268 }, + { 33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214 }, + { 1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038 }, + }, + }, + { + { + { 6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800 }, + { 4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645 }, + { -4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664 }, + }, + { + { 1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933 }, + { -25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182 }, + { -17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222 }, + }, + { + { -18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991 }, + { 20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880 }, + { 9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092 }, + }, + { + { -16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295 }, + { 19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788 }, + { 8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553 }, + }, + { + { -15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026 }, + { 11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347 }, + { -18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033 }, + }, + { + { -23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395 }, + { -27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278 }, + { 1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890 }, + }, + { + { 32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995 }, + { -30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596 }, + { -11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891 }, + }, + { + { 31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060 }, + { 11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608 }, + { -20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606 }, + }, + }, + { + { + { 7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389 }, + { -19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016 }, + { -11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341 }, + }, + { + { -22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505 }, + { 14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553 }, + { -28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655 }, + }, + { + { 15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220 }, + { 12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631 }, + { -4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099 }, + }, + { + { 26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556 }, + { 14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749 }, + { 236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930 }, + }, + { + { 1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391 }, + { 5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253 }, + { 20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066 }, + }, + { + { 24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958 }, + { -11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082 }, + { -28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383 }, + }, + { + { -30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521 }, + { -11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807 }, + { 23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948 }, + }, + { + { 9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134 }, + { -32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455 }, + { 27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629 }, + }, + }, + { + { + { -8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069 }, + { -32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746 }, + { 24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919 }, + }, + { + { 11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837 }, + { 8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906 }, + { -28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771 }, + }, + { + { -25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817 }, + { 10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098 }, + { 10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409 }, + }, + { + { -12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504 }, + { -26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727 }, + { 28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420 }, + }, + { + { -32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003 }, + { -1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605 }, + { -30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384 }, + }, + { + { -26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701 }, + { -23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683 }, + { 29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708 }, + }, + { + { -3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563 }, + { -19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260 }, + { -5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387 }, + }, + { + { -19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672 }, + { 23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686 }, + { -24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665 }, + }, + }, + { + { + { 11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182 }, + { -31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277 }, + { 14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628 }, + }, + { + { -4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474 }, + { -26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539 }, + { -25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822 }, + }, + { + { -10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970 }, + { 19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756 }, + { -24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508 }, + }, + { + { -26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683 }, + { -10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655 }, + { -20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158 }, + }, + { + { -4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125 }, + { -15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839 }, + { -20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664 }, + }, + { + { 27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294 }, + { -18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899 }, + { -11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070 }, + }, + { + { 3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294 }, + { -15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949 }, + { -21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083 }, + }, + { + { 31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420 }, + { -5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940 }, + { 29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396 }, + }, + }, + { + { + { -12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567 }, + { 20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127 }, + { -16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294 }, + }, + { + { -12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887 }, + { 22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964 }, + { 16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195 }, + }, + { + { 9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244 }, + { 24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999 }, + { -1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762 }, + }, + { + { -18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274 }, + { -33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236 }, + { -16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605 }, + }, + { + { -13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761 }, + { -22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884 }, + { -6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482 }, + }, + { + { -24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638 }, + { -11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490 }, + { -32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170 }, + }, + { + { 5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736 }, + { 10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124 }, + { -17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392 }, + }, + { + { 8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029 }, + { 6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048 }, + { 28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958 }, + }, + }, + { + { + { 24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593 }, + { 26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071 }, + { -11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692 }, + }, + { + { 11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687 }, + { -160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441 }, + { -20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001 }, + }, + { + { -938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460 }, + { -19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007 }, + { -21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762 }, + }, + { + { 15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005 }, + { -9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674 }, + { 4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035 }, + }, + { + { 7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590 }, + { -2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957 }, + { -30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812 }, + }, + { + { 33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740 }, + { -18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122 }, + { -27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158 }, + }, + { + { 8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885 }, + { 26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140 }, + { 19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857 }, + }, + { + { 801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155 }, + { 19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260 }, + { 19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483 }, + }, + }, + { + { + { -3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677 }, + { 32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815 }, + { 22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751 }, + }, + { + { -16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203 }, + { -11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208 }, + { 1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230 }, + }, + { + { 16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850 }, + { -21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389 }, + { -9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968 }, + }, + { + { -11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689 }, + { 14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880 }, + { 5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304 }, + }, + { + { 30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632 }, + { -3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412 }, + { 20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566 }, + }, + { + { -20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038 }, + { -26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232 }, + { -1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943 }, + }, + { + { 17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856 }, + { 23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738 }, + { 15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971 }, + }, + { + { -27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718 }, + { -13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697 }, + { -11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883 }, + }, + }, + { + { + { 5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912 }, + { -26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358 }, + { 3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849 }, + }, + { + { 29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307 }, + { -14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977 }, + { -6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335 }, + }, + { + { -29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644 }, + { -22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616 }, + { -27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735 }, + }, + { + { -21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099 }, + { 29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341 }, + { -936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336 }, + }, + { + { -23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646 }, + { 31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425 }, + { -17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388 }, + }, + { + { -31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743 }, + { -16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822 }, + { -8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462 }, + }, + { + { 18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985 }, + { 9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702 }, + { -22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797 }, + }, + { + { 21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293 }, + { 27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100 }, + { 19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688 }, + }, + }, + { + { + { 12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186 }, + { 2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610 }, + { -2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707 }, + }, + { + { 7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220 }, + { 915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025 }, + { 32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044 }, + }, + { + { 32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992 }, + { -4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027 }, + { 21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197 }, + }, + { + { 8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901 }, + { 31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952 }, + { 19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878 }, + }, + { + { -28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390 }, + { 32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730 }, + { 2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730 }, + }, + { + { -19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180 }, + { -30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272 }, + { -15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715 }, + }, + { + { -22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970 }, + { -31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772 }, + { -17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865 }, + }, + { + { 15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750 }, + { 20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373 }, + { 32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348 }, + }, + }, + { + { + { 9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144 }, + { -22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195 }, + { 5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086 }, + }, + { + { -13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684 }, + { -8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518 }, + { -2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233 }, + }, + { + { -5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793 }, + { -2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794 }, + { 580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435 }, + }, + { + { 23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921 }, + { 13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518 }, + { 2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563 }, + }, + { + { 14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278 }, + { -27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024 }, + { 4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030 }, + }, + { + { 10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783 }, + { 27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717 }, + { 6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844 }, + }, + { + { 14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333 }, + { 16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048 }, + { 22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760 }, + }, + { + { -4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760 }, + { -15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757 }, + { -2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112 }, + }, + }, + { + { + { -19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468 }, + { 3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184 }, + { 10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289 }, + }, + { + { 15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066 }, + { 24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882 }, + { 13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226 }, + }, + { + { 16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101 }, + { 29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279 }, + { -6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811 }, + }, + { + { 27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709 }, + { 20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714 }, + { -2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121 }, + }, + { + { 9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464 }, + { 12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847 }, + { 13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400 }, + }, + { + { 4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414 }, + { -15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158 }, + { 17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045 }, + }, + { + { -461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415 }, + { -5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459 }, + { -31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079 }, + }, + { + { 21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412 }, + { -20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743 }, + { -14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836 }, + }, + }, + { + { + { 12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022 }, + { 18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429 }, + { -6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065 }, + }, + { + { 30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861 }, + { 10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000 }, + { -33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101 }, + }, + { + { 32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815 }, + { 29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642 }, + { 10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966 }, + }, + { + { 25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574 }, + { -21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742 }, + { -18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689 }, + }, + { + { 12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020 }, + { -10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772 }, + { 3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982 }, + }, + { + { -14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953 }, + { -16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218 }, + { -17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265 }, + }, + { + { 29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073 }, + { -3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325 }, + { -11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798 }, + }, + { + { -4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870 }, + { -7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863 }, + { -13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927 }, + }, + }, + { + { + { -2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267 }, + { -9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663 }, + { 22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862 }, + }, + { + { -25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673 }, + { 15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943 }, + { 15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020 }, + }, + { + { -4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238 }, + { 11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064 }, + { 14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795 }, + }, + { + { 15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052 }, + { -10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904 }, + { 29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531 }, + }, + { + { -13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979 }, + { -5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841 }, + { 10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431 }, + }, + { + { 10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324 }, + { -31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940 }, + { 10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320 }, + }, + { + { -15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184 }, + { 14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114 }, + { 30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878 }, + }, + { + { 12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784 }, + { -2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091 }, + { -16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585 }, + }, + }, + { + { + { -8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208 }, + { 10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864 }, + { 17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661 }, + }, + { + { 7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233 }, + { 26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212 }, + { -12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525 }, + }, + { + { -24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068 }, + { 9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397 }, + { -8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988 }, + }, + { + { 5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889 }, + { 32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038 }, + { 14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697 }, + }, + { + { 20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875 }, + { -25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905 }, + { -25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656 }, + }, + { + { 11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818 }, + { 27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714 }, + { 10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203 }, + }, + { + { 20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931 }, + { -30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024 }, + { -23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084 }, + }, + { + { -1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204 }, + { 20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817 }, + { 27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667 }, + }, + }, + { + { + { 11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504 }, + { -12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768 }, + { -19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255 }, + }, + { + { 6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790 }, + { 1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438 }, + { -22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333 }, + }, + { + { 17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971 }, + { 31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905 }, + { 29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409 }, + }, + { + { 12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409 }, + { 6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499 }, + { -8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363 }, + }, + { + { 28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664 }, + { -11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324 }, + { -21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940 }, + }, + { + { 13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990 }, + { -17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914 }, + { -25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290 }, + }, + { + { 24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257 }, + { -6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433 }, + { -16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236 }, + }, + { + { -12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045 }, + { 11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093 }, + { -1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347 }, + }, + }, + { + { + { -28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191 }, + { -15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507 }, + { -12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906 }, + }, + { + { 3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018 }, + { -16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109 }, + { -23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926 }, + }, + { + { -24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528 }, + { 8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625 }, + { -32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286 }, + }, + { + { 2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033 }, + { 27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866 }, + { 21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896 }, + }, + { + { 30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075 }, + { 26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347 }, + { -22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437 }, + }, + { + { -5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165 }, + { -18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588 }, + { -32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193 }, + }, + { + { -19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017 }, + { -28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883 }, + { 21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961 }, + }, + { + { 8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043 }, + { 29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663 }, + { -20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362 }, + }, + }, + { + { + { -33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860 }, + { 2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466 }, + { -24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063 }, + }, + { + { -26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997 }, + { -1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295 }, + { -13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369 }, + }, + { + { 9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385 }, + { 18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109 }, + { 2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906 }, + }, + { + { 4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424 }, + { -19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185 }, + { 7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962 }, + }, + { + { -7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325 }, + { 10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593 }, + { 696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404 }, + }, + { + { -11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644 }, + { 17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801 }, + { 26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804 }, + }, + { + { -31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884 }, + { -586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577 }, + { -9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849 }, + }, + { + { 32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473 }, + { -8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644 }, + { -2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319 }, + }, + }, + { + { + { -11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599 }, + { -9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768 }, + { -27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084 }, + }, + { + { -27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328 }, + { -15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369 }, + { 20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920 }, + }, + { + { 12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815 }, + { -32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025 }, + { -21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397 }, + }, + { + { -20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448 }, + { 6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981 }, + { 30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165 }, + }, + { + { 32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501 }, + { 17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073 }, + { -1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861 }, + }, + { + { 14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845 }, + { -1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211 }, + { 18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870 }, + }, + { + { 10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096 }, + { 33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803 }, + { -32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168 }, + }, + { + { 30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965 }, + { -14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505 }, + { 18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598 }, + }, + }, + { + { + { 5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782 }, + { 5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900 }, + { -31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479 }, + }, + { + { -12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208 }, + { 8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232 }, + { 17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719 }, + }, + { + { 16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271 }, + { -4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326 }, + { -8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132 }, + }, + { + { 14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300 }, + { 8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570 }, + { 15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670 }, + }, + { + { -2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994 }, + { -12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913 }, + { 31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317 }, + }, + { + { -25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730 }, + { 842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096 }, + { -4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078 }, + }, + { + { -15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411 }, + { -19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905 }, + { -9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654 }, + }, + { + { -28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870 }, + { -23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498 }, + { 12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579 }, + }, + }, + { + { + { 14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677 }, + { 10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647 }, + { -2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743 }, + }, + { + { -25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468 }, + { 21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375 }, + { -25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155 }, + }, + { + { 6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725 }, + { -12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612 }, + { -10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943 }, + }, + { + { -30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944 }, + { 30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928 }, + { 9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406 }, + }, + { + { 22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139 }, + { -8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963 }, + { -31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693 }, + }, + { + { 1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734 }, + { -448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680 }, + { -24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410 }, + }, + { + { -9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931 }, + { -16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654 }, + { 22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710 }, + }, + { + { 29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180 }, + { -26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684 }, + { -10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895 }, + }, + }, + { + { + { 22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501 }, + { -11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413 }, + { 6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880 }, + }, + { + { -8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874 }, + { 22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962 }, + { -7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899 }, + }, + { + { 21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152 }, + { 9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063 }, + { 7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080 }, + }, + { + { -9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146 }, + { -17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183 }, + { -19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133 }, + }, + { + { -32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421 }, + { -3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622 }, + { -4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197 }, + }, + { + { 2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663 }, + { 31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753 }, + { 4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755 }, + }, + { + { -9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862 }, + { -26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118 }, + { 26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171 }, + }, + { + { 15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380 }, + { 16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824 }, + { 28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270 }, + }, + }, + { + { + { -817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438 }, + { -31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584 }, + { -594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562 }, + }, + { + { 30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471 }, + { 18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610 }, + { 19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269 }, + }, + { + { -30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650 }, + { 14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369 }, + { 19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461 }, + }, + { + { 30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462 }, + { -5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793 }, + { -2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218 }, + }, + { + { -24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226 }, + { 18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019 }, + { -15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037 }, + }, + { + { 31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171 }, + { -17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132 }, + { -28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841 }, + }, + { + { 21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181 }, + { -33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210 }, + { -1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040 }, + }, + { + { 3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935 }, + { 24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105 }, + { -28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814 }, + }, + }, + { + { + { 793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852 }, + { 5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581 }, + { -4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646 }, + }, + { + { 10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844 }, + { 10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025 }, + { 27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453 }, + }, + { + { -23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068 }, + { 4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192 }, + { -17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921 }, + }, + { + { -9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259 }, + { -12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426 }, + { -5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072 }, + }, + { + { -17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305 }, + { 13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832 }, + { 28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943 }, + }, + { + { -16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011 }, + { 24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447 }, + { 17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494 }, + }, + { + { -28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245 }, + { -20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859 }, + { 28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915 }, + }, + { + { 16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707 }, + { 10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848 }, + { -11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224 }, + }, + }, + { + { + { -25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391 }, + { 15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215 }, + { -23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101 }, + }, + { + { 23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713 }, + { 21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849 }, + { -7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930 }, + }, + { + { -29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940 }, + { -21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031 }, + { -17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404 }, + }, + { + { -25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243 }, + { -23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116 }, + { -24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525 }, + }, + { + { -23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509 }, + { -10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883 }, + { 15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865 }, + }, + { + { -3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660 }, + { 4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273 }, + { -28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138 }, + }, + { + { -25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560 }, + { -10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135 }, + { 2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941 }, + }, + { + { -4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739 }, + { 18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756 }, + { -30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819 }, + }, + }, + { + { + { -6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347 }, + { -27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028 }, + { 21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075 }, + }, + { + { 16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799 }, + { -2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609 }, + { -25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817 }, + }, + { + { -23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989 }, + { -30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523 }, + { 4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278 }, + }, + { + { 31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045 }, + { 19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377 }, + { 24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480 }, + }, + { + { 17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016 }, + { 510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426 }, + { 18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525 }, + }, + { + { 13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396 }, + { 9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080 }, + { 12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892 }, + }, + { + { 15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275 }, + { 11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074 }, + { 20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140 }, + }, + { + { -16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717 }, + { -1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101 }, + { 24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127 }, + }, + }, + { + { + { -12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632 }, + { -26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415 }, + { -31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160 }, + }, + { + { 31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876 }, + { 22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625 }, + { -15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478 }, + }, + { + { 27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164 }, + { 26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595 }, + { -7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248 }, + }, + { + { -16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858 }, + { 15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193 }, + { 8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184 }, + }, + { + { -18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942 }, + { -1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635 }, + { 21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948 }, + }, + { + { 11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935 }, + { -25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415 }, + { -15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416 }, + }, + { + { -7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018 }, + { 4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778 }, + { 366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659 }, + }, + { + { -24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385 }, + { 18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503 }, + { 476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329 }, + }, + }, + { + { + { 20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056 }, + { -13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838 }, + { 24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948 }, + }, + { + { -3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691 }, + { -15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118 }, + { -23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517 }, + }, + { + { -20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269 }, + { -6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904 }, + { -23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589 }, + }, + { + { -28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193 }, + { -7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910 }, + { -30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930 }, + }, + { + { -7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667 }, + { 25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481 }, + { -9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876 }, + }, + { + { 22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640 }, + { -8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278 }, + { -21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112 }, + }, + { + { 26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272 }, + { 17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012 }, + { -10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221 }, + }, + { + { 30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046 }, + { 13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345 }, + { -19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310 }, + }, + }, + { + { + { 19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937 }, + { 31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636 }, + { -9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008 }, + }, + { + { -2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429 }, + { -15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576 }, + { 31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066 }, + }, + { + { -9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490 }, + { -12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104 }, + { 33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053 }, + }, + { + { 31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275 }, + { -20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511 }, + { 22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095 }, + }, + { + { -28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439 }, + { 23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939 }, + { -23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424 }, + }, + { + { 2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310 }, + { 3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608 }, + { -32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079 }, + }, + { + { -23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101 }, + { 21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418 }, + { 18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576 }, + }, + { + { 30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356 }, + { 9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996 }, + { -26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099 }, + }, + }, + { + { + { -26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728 }, + { -13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658 }, + { -10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242 }, + }, + { + { -21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001 }, + { -4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766 }, + { 18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373 }, + }, + { + { 26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458 }, + { -17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628 }, + { -13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657 }, + }, + { + { -23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062 }, + { 25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616 }, + { 31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014 }, + }, + { + { 24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383 }, + { -25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814 }, + { -20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718 }, + }, + { + { 30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417 }, + { 2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222 }, + { 33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444 }, + }, + { + { -20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597 }, + { 23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970 }, + { 1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799 }, + }, + { + { -5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647 }, + { 13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511 }, + { -29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032 }, + }, + }, + { + { + { 9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834 }, + { -23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461 }, + { 29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062 }, + }, + { + { -25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516 }, + { -20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547 }, + { -24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240 }, + }, + { + { -17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038 }, + { -33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741 }, + { 16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103 }, + }, + { + { -19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747 }, + { -1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323 }, + { 31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016 }, + }, + { + { -14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373 }, + { 15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228 }, + { -2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141 }, + }, + { + { 16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399 }, + { 11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831 }, + { -185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376 }, + }, + { + { -32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313 }, + { -18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958 }, + { -6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577 }, + }, + { + { -22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743 }, + { 29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684 }, + { -20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476 }, + }, + }, +}; diff --git a/ed25519/src/sc.c b/ed25519/src/sc.c new file mode 100644 index 0000000..ca5bad2 --- /dev/null +++ b/ed25519/src/sc.c @@ -0,0 +1,809 @@ +#include "fixedint.h" +#include "sc.h" + +static uint64_t load_3(const unsigned char *in) { + uint64_t result; + + result = (uint64_t) in[0]; + result |= ((uint64_t) in[1]) << 8; + result |= ((uint64_t) in[2]) << 16; + + return result; +} + +static uint64_t load_4(const unsigned char *in) { + uint64_t result; + + result = (uint64_t) in[0]; + result |= ((uint64_t) in[1]) << 8; + result |= ((uint64_t) in[2]) << 16; + result |= ((uint64_t) in[3]) << 24; + + return result; +} + +/* +Input: + s[0]+256*s[1]+...+256^63*s[63] = s + +Output: + s[0]+256*s[1]+...+256^31*s[31] = s mod l + where l = 2^252 + 27742317777372353535851937790883648493. + Overwrites s in place. +*/ + +void sc_reduce(unsigned char *s) { + int64_t s0 = 2097151 & load_3(s); + int64_t s1 = 2097151 & (load_4(s + 2) >> 5); + int64_t s2 = 2097151 & (load_3(s + 5) >> 2); + int64_t s3 = 2097151 & (load_4(s + 7) >> 7); + int64_t s4 = 2097151 & (load_4(s + 10) >> 4); + int64_t s5 = 2097151 & (load_3(s + 13) >> 1); + int64_t s6 = 2097151 & (load_4(s + 15) >> 6); + int64_t s7 = 2097151 & (load_3(s + 18) >> 3); + int64_t s8 = 2097151 & load_3(s + 21); + int64_t s9 = 2097151 & (load_4(s + 23) >> 5); + int64_t s10 = 2097151 & (load_3(s + 26) >> 2); + int64_t s11 = 2097151 & (load_4(s + 28) >> 7); + int64_t s12 = 2097151 & (load_4(s + 31) >> 4); + int64_t s13 = 2097151 & (load_3(s + 34) >> 1); + int64_t s14 = 2097151 & (load_4(s + 36) >> 6); + int64_t s15 = 2097151 & (load_3(s + 39) >> 3); + int64_t s16 = 2097151 & load_3(s + 42); + int64_t s17 = 2097151 & (load_4(s + 44) >> 5); + int64_t s18 = 2097151 & (load_3(s + 47) >> 2); + int64_t s19 = 2097151 & (load_4(s + 49) >> 7); + int64_t s20 = 2097151 & (load_4(s + 52) >> 4); + int64_t s21 = 2097151 & (load_3(s + 55) >> 1); + int64_t s22 = 2097151 & (load_4(s + 57) >> 6); + int64_t s23 = (load_4(s + 60) >> 3); + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + int64_t carry10; + int64_t carry11; + int64_t carry12; + int64_t carry13; + int64_t carry14; + int64_t carry15; + int64_t carry16; + + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + s23 = 0; + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + s22 = 0; + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + s21 = 0; + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + s20 = 0; + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + s19 = 0; + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + s18 = 0; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + s17 = 0; + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + s16 = 0; + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + s15 = 0; + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + s14 = 0; + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + s13 = 0; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry11 = s11 >> 21; + s12 += carry11; + s11 -= carry11 << 21; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + s[0] = (unsigned char) (s0 >> 0); + s[1] = (unsigned char) (s0 >> 8); + s[2] = (unsigned char) ((s0 >> 16) | (s1 << 5)); + s[3] = (unsigned char) (s1 >> 3); + s[4] = (unsigned char) (s1 >> 11); + s[5] = (unsigned char) ((s1 >> 19) | (s2 << 2)); + s[6] = (unsigned char) (s2 >> 6); + s[7] = (unsigned char) ((s2 >> 14) | (s3 << 7)); + s[8] = (unsigned char) (s3 >> 1); + s[9] = (unsigned char) (s3 >> 9); + s[10] = (unsigned char) ((s3 >> 17) | (s4 << 4)); + s[11] = (unsigned char) (s4 >> 4); + s[12] = (unsigned char) (s4 >> 12); + s[13] = (unsigned char) ((s4 >> 20) | (s5 << 1)); + s[14] = (unsigned char) (s5 >> 7); + s[15] = (unsigned char) ((s5 >> 15) | (s6 << 6)); + s[16] = (unsigned char) (s6 >> 2); + s[17] = (unsigned char) (s6 >> 10); + s[18] = (unsigned char) ((s6 >> 18) | (s7 << 3)); + s[19] = (unsigned char) (s7 >> 5); + s[20] = (unsigned char) (s7 >> 13); + s[21] = (unsigned char) (s8 >> 0); + s[22] = (unsigned char) (s8 >> 8); + s[23] = (unsigned char) ((s8 >> 16) | (s9 << 5)); + s[24] = (unsigned char) (s9 >> 3); + s[25] = (unsigned char) (s9 >> 11); + s[26] = (unsigned char) ((s9 >> 19) | (s10 << 2)); + s[27] = (unsigned char) (s10 >> 6); + s[28] = (unsigned char) ((s10 >> 14) | (s11 << 7)); + s[29] = (unsigned char) (s11 >> 1); + s[30] = (unsigned char) (s11 >> 9); + s[31] = (unsigned char) (s11 >> 17); +} + + + +/* +Input: + a[0]+256*a[1]+...+256^31*a[31] = a + b[0]+256*b[1]+...+256^31*b[31] = b + c[0]+256*c[1]+...+256^31*c[31] = c + +Output: + s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l + where l = 2^252 + 27742317777372353535851937790883648493. +*/ + +void sc_muladd(unsigned char *s, const unsigned char *a, const unsigned char *b, const unsigned char *c) { + int64_t a0 = 2097151 & load_3(a); + int64_t a1 = 2097151 & (load_4(a + 2) >> 5); + int64_t a2 = 2097151 & (load_3(a + 5) >> 2); + int64_t a3 = 2097151 & (load_4(a + 7) >> 7); + int64_t a4 = 2097151 & (load_4(a + 10) >> 4); + int64_t a5 = 2097151 & (load_3(a + 13) >> 1); + int64_t a6 = 2097151 & (load_4(a + 15) >> 6); + int64_t a7 = 2097151 & (load_3(a + 18) >> 3); + int64_t a8 = 2097151 & load_3(a + 21); + int64_t a9 = 2097151 & (load_4(a + 23) >> 5); + int64_t a10 = 2097151 & (load_3(a + 26) >> 2); + int64_t a11 = (load_4(a + 28) >> 7); + int64_t b0 = 2097151 & load_3(b); + int64_t b1 = 2097151 & (load_4(b + 2) >> 5); + int64_t b2 = 2097151 & (load_3(b + 5) >> 2); + int64_t b3 = 2097151 & (load_4(b + 7) >> 7); + int64_t b4 = 2097151 & (load_4(b + 10) >> 4); + int64_t b5 = 2097151 & (load_3(b + 13) >> 1); + int64_t b6 = 2097151 & (load_4(b + 15) >> 6); + int64_t b7 = 2097151 & (load_3(b + 18) >> 3); + int64_t b8 = 2097151 & load_3(b + 21); + int64_t b9 = 2097151 & (load_4(b + 23) >> 5); + int64_t b10 = 2097151 & (load_3(b + 26) >> 2); + int64_t b11 = (load_4(b + 28) >> 7); + int64_t c0 = 2097151 & load_3(c); + int64_t c1 = 2097151 & (load_4(c + 2) >> 5); + int64_t c2 = 2097151 & (load_3(c + 5) >> 2); + int64_t c3 = 2097151 & (load_4(c + 7) >> 7); + int64_t c4 = 2097151 & (load_4(c + 10) >> 4); + int64_t c5 = 2097151 & (load_3(c + 13) >> 1); + int64_t c6 = 2097151 & (load_4(c + 15) >> 6); + int64_t c7 = 2097151 & (load_3(c + 18) >> 3); + int64_t c8 = 2097151 & load_3(c + 21); + int64_t c9 = 2097151 & (load_4(c + 23) >> 5); + int64_t c10 = 2097151 & (load_3(c + 26) >> 2); + int64_t c11 = (load_4(c + 28) >> 7); + int64_t s0; + int64_t s1; + int64_t s2; + int64_t s3; + int64_t s4; + int64_t s5; + int64_t s6; + int64_t s7; + int64_t s8; + int64_t s9; + int64_t s10; + int64_t s11; + int64_t s12; + int64_t s13; + int64_t s14; + int64_t s15; + int64_t s16; + int64_t s17; + int64_t s18; + int64_t s19; + int64_t s20; + int64_t s21; + int64_t s22; + int64_t s23; + int64_t carry0; + int64_t carry1; + int64_t carry2; + int64_t carry3; + int64_t carry4; + int64_t carry5; + int64_t carry6; + int64_t carry7; + int64_t carry8; + int64_t carry9; + int64_t carry10; + int64_t carry11; + int64_t carry12; + int64_t carry13; + int64_t carry14; + int64_t carry15; + int64_t carry16; + int64_t carry17; + int64_t carry18; + int64_t carry19; + int64_t carry20; + int64_t carry21; + int64_t carry22; + + s0 = c0 + a0 * b0; + s1 = c1 + a0 * b1 + a1 * b0; + s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0; + s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0; + s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0; + s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0; + s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0; + s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0; + s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + a8 * b0; + s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0; + s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0; + s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0; + s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1; + s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2; + s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3; + s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4; + s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5; + s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6; + s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7; + s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8; + s20 = a9 * b11 + a10 * b10 + a11 * b9; + s21 = a10 * b11 + a11 * b10; + s22 = a11 * b11; + s23 = 0; + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + carry18 = (s18 + (1 << 20)) >> 21; + s19 += carry18; + s18 -= carry18 << 21; + carry20 = (s20 + (1 << 20)) >> 21; + s21 += carry20; + s20 -= carry20 << 21; + carry22 = (s22 + (1 << 20)) >> 21; + s23 += carry22; + s22 -= carry22 << 21; + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + carry17 = (s17 + (1 << 20)) >> 21; + s18 += carry17; + s17 -= carry17 << 21; + carry19 = (s19 + (1 << 20)) >> 21; + s20 += carry19; + s19 -= carry19 << 21; + carry21 = (s21 + (1 << 20)) >> 21; + s22 += carry21; + s21 -= carry21 << 21; + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + s23 = 0; + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + s22 = 0; + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + s21 = 0; + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + s20 = 0; + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + s19 = 0; + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + s18 = 0; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + s17 = 0; + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + s16 = 0; + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + s15 = 0; + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + s14 = 0; + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + s13 = 0; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry11 = s11 >> 21; + s12 += carry11; + s11 -= carry11 << 21; + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + s[0] = (unsigned char) (s0 >> 0); + s[1] = (unsigned char) (s0 >> 8); + s[2] = (unsigned char) ((s0 >> 16) | (s1 << 5)); + s[3] = (unsigned char) (s1 >> 3); + s[4] = (unsigned char) (s1 >> 11); + s[5] = (unsigned char) ((s1 >> 19) | (s2 << 2)); + s[6] = (unsigned char) (s2 >> 6); + s[7] = (unsigned char) ((s2 >> 14) | (s3 << 7)); + s[8] = (unsigned char) (s3 >> 1); + s[9] = (unsigned char) (s3 >> 9); + s[10] = (unsigned char) ((s3 >> 17) | (s4 << 4)); + s[11] = (unsigned char) (s4 >> 4); + s[12] = (unsigned char) (s4 >> 12); + s[13] = (unsigned char) ((s4 >> 20) | (s5 << 1)); + s[14] = (unsigned char) (s5 >> 7); + s[15] = (unsigned char) ((s5 >> 15) | (s6 << 6)); + s[16] = (unsigned char) (s6 >> 2); + s[17] = (unsigned char) (s6 >> 10); + s[18] = (unsigned char) ((s6 >> 18) | (s7 << 3)); + s[19] = (unsigned char) (s7 >> 5); + s[20] = (unsigned char) (s7 >> 13); + s[21] = (unsigned char) (s8 >> 0); + s[22] = (unsigned char) (s8 >> 8); + s[23] = (unsigned char) ((s8 >> 16) | (s9 << 5)); + s[24] = (unsigned char) (s9 >> 3); + s[25] = (unsigned char) (s9 >> 11); + s[26] = (unsigned char) ((s9 >> 19) | (s10 << 2)); + s[27] = (unsigned char) (s10 >> 6); + s[28] = (unsigned char) ((s10 >> 14) | (s11 << 7)); + s[29] = (unsigned char) (s11 >> 1); + s[30] = (unsigned char) (s11 >> 9); + s[31] = (unsigned char) (s11 >> 17); +} diff --git a/ed25519/src/sc.h b/ed25519/src/sc.h new file mode 100644 index 0000000..e29e7fa --- /dev/null +++ b/ed25519/src/sc.h @@ -0,0 +1,12 @@ +#ifndef SC_H +#define SC_H + +/* +The set of scalars is \Z/l +where l = 2^252 + 27742317777372353535851937790883648493. +*/ + +void sc_reduce(unsigned char *s); +void sc_muladd(unsigned char *s, const unsigned char *a, const unsigned char *b, const unsigned char *c); + +#endif diff --git a/ed25519/src/seed.c b/ed25519/src/seed.c new file mode 100644 index 0000000..11a2e3e --- /dev/null +++ b/ed25519/src/seed.c @@ -0,0 +1,40 @@ +#include "ed25519.h" + +#ifndef ED25519_NO_SEED + +#ifdef _WIN32 +#include +#include +#else +#include +#endif + +int ed25519_create_seed(unsigned char *seed) { +#ifdef _WIN32 + HCRYPTPROV prov; + + if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { + return 1; + } + + if (!CryptGenRandom(prov, 32, seed)) { + CryptReleaseContext(prov, 0); + return 1; + } + + CryptReleaseContext(prov, 0); +#else + FILE *f = fopen("/dev/urandom", "rb"); + + if (f == NULL) { + return 1; + } + + fread(seed, 1, 32, f); + fclose(f); +#endif + + return 0; +} + +#endif diff --git a/ed25519/src/sha512.c b/ed25519/src/sha512.c new file mode 100644 index 0000000..cb8ae71 --- /dev/null +++ b/ed25519/src/sha512.c @@ -0,0 +1,275 @@ +/* LibTomCrypt, modular cryptographic library -- Tom St Denis + * + * LibTomCrypt is a library that provides various cryptographic + * algorithms in a highly modular and flexible manner. + * + * The library is free for all purposes without any express + * guarantee it works. + * + * Tom St Denis, tomstdenis@gmail.com, http://libtom.org + */ + +#include "fixedint.h" +#include "sha512.h" + +/* the K array */ +static const uint64_t K[80] = { + UINT64_C(0x428a2f98d728ae22), UINT64_C(0x7137449123ef65cd), + UINT64_C(0xb5c0fbcfec4d3b2f), UINT64_C(0xe9b5dba58189dbbc), + UINT64_C(0x3956c25bf348b538), UINT64_C(0x59f111f1b605d019), + UINT64_C(0x923f82a4af194f9b), UINT64_C(0xab1c5ed5da6d8118), + UINT64_C(0xd807aa98a3030242), UINT64_C(0x12835b0145706fbe), + UINT64_C(0x243185be4ee4b28c), UINT64_C(0x550c7dc3d5ffb4e2), + UINT64_C(0x72be5d74f27b896f), UINT64_C(0x80deb1fe3b1696b1), + UINT64_C(0x9bdc06a725c71235), UINT64_C(0xc19bf174cf692694), + UINT64_C(0xe49b69c19ef14ad2), UINT64_C(0xefbe4786384f25e3), + UINT64_C(0x0fc19dc68b8cd5b5), UINT64_C(0x240ca1cc77ac9c65), + UINT64_C(0x2de92c6f592b0275), UINT64_C(0x4a7484aa6ea6e483), + UINT64_C(0x5cb0a9dcbd41fbd4), UINT64_C(0x76f988da831153b5), + UINT64_C(0x983e5152ee66dfab), UINT64_C(0xa831c66d2db43210), + UINT64_C(0xb00327c898fb213f), UINT64_C(0xbf597fc7beef0ee4), + UINT64_C(0xc6e00bf33da88fc2), UINT64_C(0xd5a79147930aa725), + UINT64_C(0x06ca6351e003826f), UINT64_C(0x142929670a0e6e70), + UINT64_C(0x27b70a8546d22ffc), UINT64_C(0x2e1b21385c26c926), + UINT64_C(0x4d2c6dfc5ac42aed), UINT64_C(0x53380d139d95b3df), + UINT64_C(0x650a73548baf63de), UINT64_C(0x766a0abb3c77b2a8), + UINT64_C(0x81c2c92e47edaee6), UINT64_C(0x92722c851482353b), + UINT64_C(0xa2bfe8a14cf10364), UINT64_C(0xa81a664bbc423001), + UINT64_C(0xc24b8b70d0f89791), UINT64_C(0xc76c51a30654be30), + UINT64_C(0xd192e819d6ef5218), UINT64_C(0xd69906245565a910), + UINT64_C(0xf40e35855771202a), UINT64_C(0x106aa07032bbd1b8), + UINT64_C(0x19a4c116b8d2d0c8), UINT64_C(0x1e376c085141ab53), + UINT64_C(0x2748774cdf8eeb99), UINT64_C(0x34b0bcb5e19b48a8), + UINT64_C(0x391c0cb3c5c95a63), UINT64_C(0x4ed8aa4ae3418acb), + UINT64_C(0x5b9cca4f7763e373), UINT64_C(0x682e6ff3d6b2b8a3), + UINT64_C(0x748f82ee5defb2fc), UINT64_C(0x78a5636f43172f60), + UINT64_C(0x84c87814a1f0ab72), UINT64_C(0x8cc702081a6439ec), + UINT64_C(0x90befffa23631e28), UINT64_C(0xa4506cebde82bde9), + UINT64_C(0xbef9a3f7b2c67915), UINT64_C(0xc67178f2e372532b), + UINT64_C(0xca273eceea26619c), UINT64_C(0xd186b8c721c0c207), + UINT64_C(0xeada7dd6cde0eb1e), UINT64_C(0xf57d4f7fee6ed178), + UINT64_C(0x06f067aa72176fba), UINT64_C(0x0a637dc5a2c898a6), + UINT64_C(0x113f9804bef90dae), UINT64_C(0x1b710b35131c471b), + UINT64_C(0x28db77f523047d84), UINT64_C(0x32caab7b40c72493), + UINT64_C(0x3c9ebe0a15c9bebc), UINT64_C(0x431d67c49c100d4c), + UINT64_C(0x4cc5d4becb3e42b6), UINT64_C(0x597f299cfc657e2a), + UINT64_C(0x5fcb6fab3ad6faec), UINT64_C(0x6c44198c4a475817) +}; + +/* Various logical functions */ + +#define ROR64c(x, y) \ + ( ((((x)&UINT64_C(0xFFFFFFFFFFFFFFFF))>>((uint64_t)(y)&UINT64_C(63))) | \ + ((x)<<((uint64_t)(64-((y)&UINT64_C(63)))))) & UINT64_C(0xFFFFFFFFFFFFFFFF)) + +#define STORE64H(x, y) \ + { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \ + (y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \ + (y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \ + (y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } + +#define LOAD64H(x, y) \ + { x = (((uint64_t)((y)[0] & 255))<<56)|(((uint64_t)((y)[1] & 255))<<48) | \ + (((uint64_t)((y)[2] & 255))<<40)|(((uint64_t)((y)[3] & 255))<<32) | \ + (((uint64_t)((y)[4] & 255))<<24)|(((uint64_t)((y)[5] & 255))<<16) | \ + (((uint64_t)((y)[6] & 255))<<8)|(((uint64_t)((y)[7] & 255))); } + + +#define Ch(x,y,z) (z ^ (x & (y ^ z))) +#define Maj(x,y,z) (((x | y) & z) | (x & y)) +#define S(x, n) ROR64c(x, n) +#define R(x, n) (((x) &UINT64_C(0xFFFFFFFFFFFFFFFF))>>((uint64_t)n)) +#define Sigma0(x) (S(x, 28) ^ S(x, 34) ^ S(x, 39)) +#define Sigma1(x) (S(x, 14) ^ S(x, 18) ^ S(x, 41)) +#define Gamma0(x) (S(x, 1) ^ S(x, 8) ^ R(x, 7)) +#define Gamma1(x) (S(x, 19) ^ S(x, 61) ^ R(x, 6)) +#ifndef MIN + #define MIN(x, y) ( ((x)<(y))?(x):(y) ) +#endif + +/* compress 1024-bits */ +static int sha512_compress(sha512_context *md, unsigned char *buf) +{ + uint64_t S[8], W[80], t0, t1; + int i; + + /* copy state into S */ + for (i = 0; i < 8; i++) { + S[i] = md->state[i]; + } + + /* copy the state into 1024-bits into W[0..15] */ + for (i = 0; i < 16; i++) { + LOAD64H(W[i], buf + (8*i)); + } + + /* fill W[16..79] */ + for (i = 16; i < 80; i++) { + W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; + } + +/* Compress */ + #define RND(a,b,c,d,e,f,g,h,i) \ + t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \ + t1 = Sigma0(a) + Maj(a, b, c);\ + d += t0; \ + h = t0 + t1; + + for (i = 0; i < 80; i += 8) { + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i+0); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],i+1); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],i+2); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],i+3); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],i+4); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],i+5); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],i+6); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],i+7); + } + + #undef RND + + + + /* feedback */ + for (i = 0; i < 8; i++) { + md->state[i] = md->state[i] + S[i]; + } + + return 0; +} + + +/** + Initialize the hash state + @param md The hash state you wish to initialize + @return 0 if successful +*/ +int sha512_init(sha512_context * md) { + if (md == NULL) return 1; + + md->curlen = 0; + md->length = 0; + md->state[0] = UINT64_C(0x6a09e667f3bcc908); + md->state[1] = UINT64_C(0xbb67ae8584caa73b); + md->state[2] = UINT64_C(0x3c6ef372fe94f82b); + md->state[3] = UINT64_C(0xa54ff53a5f1d36f1); + md->state[4] = UINT64_C(0x510e527fade682d1); + md->state[5] = UINT64_C(0x9b05688c2b3e6c1f); + md->state[6] = UINT64_C(0x1f83d9abfb41bd6b); + md->state[7] = UINT64_C(0x5be0cd19137e2179); + + return 0; +} + +/** + Process a block of memory though the hash + @param md The hash state + @param in The data to hash + @param inlen The length of the data (octets) + @return 0 if successful +*/ +int sha512_update (sha512_context * md, const unsigned char *in, size_t inlen) +{ + size_t n; + size_t i; + int err; + if (md == NULL) return 1; + if (in == NULL) return 1; + if (md->curlen > sizeof(md->buf)) { + return 1; + } + while (inlen > 0) { + if (md->curlen == 0 && inlen >= 128) { + if ((err = sha512_compress (md, (unsigned char *)in)) != 0) { + return err; + } + md->length += 128 * 8; + in += 128; + inlen -= 128; + } else { + n = MIN(inlen, (128 - md->curlen)); + + for (i = 0; i < n; i++) { + md->buf[i + md->curlen] = in[i]; + } + + + md->curlen += n; + in += n; + inlen -= n; + if (md->curlen == 128) { + if ((err = sha512_compress (md, md->buf)) != 0) { + return err; + } + md->length += 8*128; + md->curlen = 0; + } + } + } + return 0; +} + +/** + Terminate the hash to get the digest + @param md The hash state + @param out [out] The destination of the hash (64 bytes) + @return 0 if successful +*/ + int sha512_final(sha512_context * md, unsigned char *out) + { + int i; + + if (md == NULL) return 1; + if (out == NULL) return 1; + + if (md->curlen >= sizeof(md->buf)) { + return 1; + } + + /* increase the length of the message */ + md->length += md->curlen * UINT64_C(8); + + /* append the '1' bit */ + md->buf[md->curlen++] = (unsigned char)0x80; + + /* if the length is currently above 112 bytes we append zeros + * then compress. Then we can fall back to padding zeros and length + * encoding like normal. + */ + if (md->curlen > 112) { + while (md->curlen < 128) { + md->buf[md->curlen++] = (unsigned char)0; + } + sha512_compress(md, md->buf); + md->curlen = 0; + } + + /* pad upto 120 bytes of zeroes + * note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash + * > 2^64 bits of data... :-) + */ +while (md->curlen < 120) { + md->buf[md->curlen++] = (unsigned char)0; +} + + /* store length */ +STORE64H(md->length, md->buf+120); +sha512_compress(md, md->buf); + + /* copy output */ +for (i = 0; i < 8; i++) { + STORE64H(md->state[i], out+(8*i)); +} + +return 0; +} + +int sha512(const unsigned char *message, size_t message_len, unsigned char *out) +{ + sha512_context ctx; + int ret; + if ((ret = sha512_init(&ctx))) return ret; + if ((ret = sha512_update(&ctx, message, message_len))) return ret; + if ((ret = sha512_final(&ctx, out))) return ret; + return 0; +} diff --git a/ed25519/src/sha512.h b/ed25519/src/sha512.h new file mode 100644 index 0000000..a34dd5e --- /dev/null +++ b/ed25519/src/sha512.h @@ -0,0 +1,21 @@ +#ifndef SHA512_H +#define SHA512_H + +#include + +#include "fixedint.h" + +/* state */ +typedef struct sha512_context_ { + uint64_t length, state[8]; + size_t curlen; + unsigned char buf[128]; +} sha512_context; + + +int sha512_init(sha512_context * md); +int sha512_final(sha512_context * md, unsigned char *out); +int sha512_update(sha512_context * md, const unsigned char *in, size_t inlen); +int sha512(const unsigned char *message, size_t message_len, unsigned char *out); + +#endif diff --git a/ed25519/src/sign.c b/ed25519/src/sign.c new file mode 100644 index 0000000..4db246d --- /dev/null +++ b/ed25519/src/sign.c @@ -0,0 +1,29 @@ +#include "ed25519.h" +#include "sha512.h" +#include "ge.h" +#include "sc.h" + +void ed25519_sign(unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key_write, const unsigned char *private_key_write) { + sha512_context hash; + unsigned char hram[64]; + unsigned char r[64]; + ge_p3 R; + + sha512_init(&hash); + sha512_update(&hash, private_key_write + 32, 32); + sha512_update(&hash, message, message_len); + sha512_final(&hash, r); + + sc_reduce(r); + ge_scalarmult_base(&R, r); + ge_p3_tobytes(signature, &R); + + sha512_init(&hash); + sha512_update(&hash, signature, 32); + sha512_update(&hash, public_key_write, 32); + sha512_update(&hash, message, message_len); + sha512_final(&hash, hram); + + sc_reduce(hram); + sc_muladd(signature + 32, hram, private_key_write, r); +} diff --git a/ed25519/src/verify.c b/ed25519/src/verify.c new file mode 100644 index 0000000..29f56c7 --- /dev/null +++ b/ed25519/src/verify.c @@ -0,0 +1,153 @@ +#include "ed25519.h" +#include "sha512.h" +#include "ge.h" +#include "sc.h" + +static int consttime_equal(const unsigned char *x, const unsigned char *y) { + unsigned char r = 0; + + r = x[0] ^ y[0]; + #define F(i) r |= x[i] ^ y[i] + F(1); + F(2); + F(3); + F(4); + F(5); + F(6); + F(7); + F(8); + F(9); + F(10); + F(11); + F(12); + F(13); + F(14); + F(15); + F(16); + F(17); + F(18); + F(19); + F(20); + F(21); + F(22); + F(23); + F(24); + F(25); + F(26); + F(27); + F(28); + F(29); + F(30); + F(31); + #undef F + + return !r; +} + +int ed25519_verify(const unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key_write) { + unsigned char h[64]; + unsigned char checker[32]; + sha512_context hash; + ge_p3 A; + ge_p2 R; + + if (signature[63] & 224) { + return 0; + } + + if (ge_frombytes_negate_vartime(&A, public_key_write) != 0) { + return 0; + } + + sha512_init(&hash); + sha512_update(&hash, signature, 32); + sha512_update(&hash, public_key_write, 32); + sha512_update(&hash, message, message_len); + sha512_final(&hash, h); + + sc_reduce(h); + ge_double_scalarmult_vartime(&R, h, &A, signature + 32); + ge_tobytes(checker, &R); + + if (!consttime_equal(checker, signature)) { + return 0; + } + + return 1; +} + +///////////////////////////////////////////////////////////////////////////////////////// + +#include +#include + +struct VerifyContext { + const unsigned char *signature; + sha512_context hash; +}; + + +void * +ed25519_verify_init(const unsigned char *signature, const unsigned char *public_key_write) +{ + struct VerifyContext *ctx; + + if (signature[63] & 224) { + return NULL; + } + + if (NULL == (ctx = malloc(sizeof(*ctx)))) { + return NULL; + } + + ctx->signature = signature; + + sha512_init(&ctx->hash); + sha512_update(&ctx->hash, signature, 32); + sha512_update(&ctx->hash, public_key_write, 32); + ctx->signature = signature; + + return (void *)ctx; +} + + +void +ed25519_verify_update(void *context, const unsigned char *message, size_t message_len) +{ + if (NULL == context) { + return; + } + + struct VerifyContext *ctx = (struct VerifyContext *)context; + sha512_update(&ctx->hash, message, message_len); +} + + +int +ed25519_verify_final(void *context) +{ + unsigned char h[64]; + unsigned char checker[32]; + ge_p3 A; + ge_p2 R; + + if (NULL == context) { + return 0; + } + + struct VerifyContext *ctx = (struct VerifyContext *)context; + sha512_final(&ctx->hash, h); + + sc_reduce(h); + ge_double_scalarmult_vartime(&R, h, &A, ctx->signature + 32); + ge_tobytes(checker, &R); + + const int ret = !consttime_equal(checker, ctx->signature); + + memset(ctx, 0, sizeof(*ctx)); + free((void *)ctx); + + return ret; +} + +// diff --git a/ed25519/test.c b/ed25519/test.c new file mode 100644 index 0000000..e2159a9 --- /dev/null +++ b/ed25519/test.c @@ -0,0 +1,150 @@ +#include +#include +#include +#include + +/* #define ED25519_DLL */ +#include "src/ed25519.h" + +#include "src/ge.h" +#include "src/sc.h" + + +int main() { + unsigned char public_key[32], private_key[64], seed[32], scalar[32]; + unsigned char other_public_key[32], other_private_key[64]; + unsigned char shared_secret[32], other_shared_secret[32]; + unsigned char signature[64]; + + clock_t start; + clock_t end; + int i; + + const unsigned char message[] = "Hello, world!"; + const int message_len = strlen((char*) message); + + /* create a random seed, and a keypair out of that seed */ + ed25519_create_seed(seed); + ed25519_create_keypair(public_key, private_key, seed); + + /* create signature on the message with the keypair */ + ed25519_sign(signature, message, message_len, public_key, private_key); + + /* verify the signature */ + if (ed25519_verify(signature, message, message_len, public_key)) { + printf("valid signature\n"); + } else { + printf("invalid signature\n"); + } + + /* create scalar and add it to the keypair */ + ed25519_create_seed(scalar); + ed25519_add_scalar(public_key, private_key, scalar); + + /* create signature with the new keypair */ + ed25519_sign(signature, message, message_len, public_key, private_key); + + /* verify the signature with the new keypair */ + if (ed25519_verify(signature, message, message_len, public_key)) { + printf("valid signature\n"); + } else { + printf("invalid signature\n"); + } + + /* make a slight adjustment and verify again */ + signature[44] ^= 0x10; + if (ed25519_verify(signature, message, message_len, public_key)) { + printf("did not detect signature change\n"); + } else { + printf("correctly detected signature change\n"); + } + + /* generate two keypairs for testing key exchange */ + ed25519_create_seed(seed); + ed25519_create_keypair(public_key, private_key, seed); + ed25519_create_seed(seed); + ed25519_create_keypair(other_public_key, other_private_key, seed); + + /* create two shared secrets - from both perspectives - and check if they're equal */ + ed25519_key_exchange(shared_secret, other_public_key, private_key); + ed25519_key_exchange(other_shared_secret, public_key, other_private_key); + + for (i = 0; i < 32; ++i) { + if (shared_secret[i] != other_shared_secret[i]) { + printf("key exchange was incorrect\n"); + break; + } + } + + if (i == 32) { + printf("key exchange was correct\n"); + } + + /* test performance */ + printf("testing seed generation performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_create_seed(seed); + } + end = clock(); + + printf("%fus per seed\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + + printf("testing key generation performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_create_keypair(public_key, private_key, seed); + } + end = clock(); + + printf("%fus per keypair\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + printf("testing sign performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_sign(signature, message, message_len, public_key, private_key); + } + end = clock(); + + printf("%fus per signature\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + printf("testing verify performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_verify(signature, message, message_len, public_key); + } + end = clock(); + + printf("%fus per signature\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + + printf("testing keypair scalar addition performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_add_scalar(public_key, private_key, scalar); + } + end = clock(); + + printf("%fus per keypair\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + printf("testing public key scalar addition performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_add_scalar(public_key, NULL, scalar); + } + end = clock(); + + printf("%fus per key\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + printf("testing key exchange performance: "); + start = clock(); + for (i = 0; i < 10000; ++i) { + ed25519_key_exchange(shared_secret, other_public_key, private_key); + } + end = clock(); + + printf("%fus per shared secret\n", ((double) ((end - start) * 1000)) / CLOCKS_PER_SEC / i * 1000); + + return 0; +} diff --git a/example/grief.manifest b/example/grief.manifest index 66e8dfe..c0814a1 100644 --- a/example/grief.manifest +++ b/example/grief.manifest @@ -11,31 +11,13 @@ https://master.dl.sourceforge.net/project/grief/README.txt?viasf=1 -body { - font: 80%/1.5em Verdana, Tahoma, arial, Sans-serif; - background: #ECECEA; - color: #333; -} -h1 { - font: Bold 150% Verdana, 'Trebuchet MS', Sans-serif; - color: #558C89; - text-align: center; - border-bottom: 1px solid #000000; -} -h2 { - font: Bold 120% Verdana, 'Trebuchet MS', Sans-serif; - color: #74AFAD; - border-width: 0px; -} -p { - margin: 0; - padding: 10px 0 0 0; -} -ul { - list-style-type: circle; - padding: 0px; - margin: 0px; -} +

Change Log

diff --git a/expat/xmlparse.c b/expat/xmlparse.c index 391866d..2409101 100644 --- a/expat/xmlparse.c +++ b/expat/xmlparse.c @@ -7315,7 +7315,7 @@ accountingReportDiff(XML_Parser rootParser, fprintf(stderr, " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"", - (int)bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP", + (ptrdiff_t)bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP", levelsAwayFromRootParser, source_line, 10, ""); { /*WATCOMC*/ @@ -8003,6 +8003,9 @@ unsignedCharToPrintable(unsigned char c) { assert(0); /* never gets here */ return "dead code"; } +#if defined(_MSC_VER) +#pragma warning(disable:4702) // unreachable code +#endif assert(0); /* never gets here */ } diff --git a/libautoupdater.cpp b/libautoupdater.cpp index 5e74050..cef994b 100644 --- a/libautoupdater.cpp +++ b/libautoupdater.cpp @@ -1,5 +1,5 @@ /* -*- mode: c; indent-width: 4; -*- */ -/* $Id: libautoupdater.cpp,v 1.28 2025/04/16 12:08:23 cvsuser Exp $ +/* $Id: libautoupdater.cpp,v 1.30 2025/04/21 13:58:27 cvsuser Exp $ * * libautoupdater cdecl interface. * @@ -63,6 +63,7 @@ #include "AutoThread.h" #include "AutoDownload.h" +#include "util/Base64.h" #include "localisation/NSLocalizedString.h" #if defined(PRAGMA_COMMENT_LIB) @@ -233,7 +234,14 @@ extern "C" { LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY autoupdate_version(void) { - return 0x1001; /* version 1.0.1 */ + return 0x1003; /* version 1.0.3 */ +} + + +LIBAUTOUPDATER_LINKAGE const char * LIBAUTOUPDATER_ENTRY +autoupdate_version_string(void) +{ + return "1.0.3"; } @@ -400,6 +408,48 @@ autoupdate_isavailable(void) } +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +autoupdate_ed25519_key(const char *public_base64, unsigned version) +{ + const char *label = "autoupdate_ed25519_key: "; + int ret = -1; + + try { + Config::SetPublicKey(public_base64, version); + + } catch (const std::exception& e) { + LOG() << label << e.what() << LOG_ENDL; + } catch (...) { + LOG() << label << "Unknown exception" << LOG_ENDL; + } + return ret; +} + + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +autoupdate_ed25519_pem(const char *public_pem, unsigned version) +{ + const char* label = "autoupdate_ed25519_pem: "; + int ret = -1; + + try { + struct SignKeyPair keypair; + + if (0 != ed25519_load_pem(NULL, public_pem, &keypair)) { + throw SysException("error reading public-key file"); + } + + Config::SetEd25519Key(keypair.public_key, sizeof(keypair.public_key), version); + + } catch (const std::exception& e) { + LOG() << label << e.what() << LOG_ENDL; + } catch (...) { + LOG() << label << "Unknown exception" << LOG_ENDL; + } + return ret; +} + + LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY autoupdate_execute(int mode, int interactive) { diff --git a/libautoupdater.h b/libautoupdater.h index 20c1fef..3cdf303 100644 --- a/libautoupdater.h +++ b/libautoupdater.h @@ -1,13 +1,13 @@ #pragma once #ifndef LIBAUTOUPDATER_H_INCLUDED #define LIBAUTOUPDATER_H_INCLUDED -/* $Id: libautoupdater.h,v 1.11 2023/10/15 06:37:59 cvsuser Exp $ +/* $Id: libautoupdater.h,v 1.13 2025/04/21 13:58:27 cvsuser Exp $ * * libappupdatee public binding * * This file is part of libautoupdater (https://github.com/adamyg/libappupdater) * - * Copyright (c) 2012 - 2023 Adam Young + * Copyright (c) 2012 - 2025 Adam Young * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,27 +28,19 @@ * SOFTWARE. */ -#if !defined(LIBAUTOUPDATER_LINKAGE) -#if defined(AUTOUPDATER_STATIC) -# define LIBAUTOUPDATER_LINKAGE -# define LIBAUTOUPDATER_ENTRY -#elif defined(WIN32) || defined(_WIN32) -# if defined(BUILDING_LIBAUTOUPDATER) -# define LIBAUTOUPDATER_LINKAGE __declspec(dllexport) -# else -# define LIBAUTOUPDATER_LINKAGE __declspec(dllimport) -# endif -# define LIBAUTOUPDATER_ENTRY __cdecl -#else -# define LIBAUTOUPDATER_LINKAGE -# define LIBAUTOUPDATER_ENTRY -#endif -#endif +#include "src/AutoLinkage.h" +#include "src/AutoEd25519.h" #if defined(__cplusplus) extern "C" { #endif +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY + autoupdate_version(void); + +LIBAUTOUPDATER_LINKAGE const char * LIBAUTOUPDATER_ENTRY + autoupdate_version_string(void); + LIBAUTOUPDATER_LINKAGE void LIBAUTOUPDATER_ENTRY autoupdate_set_console_mode(int val); @@ -79,6 +71,12 @@ LIBAUTOUPDATER_LINKAGE void LIBAUTOUPDATER_ENTRY LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY autoupdate_isavailable(void); +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY + autoupdate_ed25519_key(const char *public_base64, unsigned version); + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY + autoupdate_ed25519_pem(const char *public_pem, unsigned version); + LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY autoupdate_execute(int mode, int interactive); diff --git a/localisation/NSRes.cpp b/localisation/util/NSRes.cpp similarity index 90% rename from localisation/NSRes.cpp rename to localisation/util/NSRes.cpp index 3ba772f..72715e5 100644 --- a/localisation/NSRes.cpp +++ b/localisation/util/NSRes.cpp @@ -1,4 +1,4 @@ -// $Id: NSRes.cpp,v 1.2 2021/08/26 14:31:31 cvsuser Exp $ +// $Id: NSRes.cpp,v 1.2 2025/04/21 13:58:27 cvsuser Exp $ // // NSRes - Localization resource converter. // @@ -7,8 +7,8 @@ #include #include -#include "../test/upgetopt.h" -#include "NSLocalizedCollectionImpl.h" +#include "../NSLocalizedCollectionImpl.h" +#include "../../util/upgetopt.h" static const char *progname = "NSRes"; @@ -76,4 +76,6 @@ Usage() exit(99); } -#include "NSLocalizedCollectionImpl.cpp" +#include "../NSLocalizedCollectionImpl.cpp" + +//end \ No newline at end of file diff --git a/msvc/.cvsignore b/msvc/.cvsignore new file mode 100644 index 0000000..650c023 --- /dev/null +++ b/msvc/.cvsignore @@ -0,0 +1,4 @@ +Debug.* +Release.* +*.pem + diff --git a/msvc/CAutoUpdater.vs140.vcxproj b/msvc/CAutoUpdater.vs140.vcxproj index 94c4fcd..0a35656 100644 --- a/msvc/CAutoUpdater.vs140.vcxproj +++ b/msvc/CAutoUpdater.vs140.vcxproj @@ -75,21 +75,23 @@ $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\AutoUpdater\ + $(Configuration).vs140\$(Platform)\CAutoUpdater\ + true MinimumRecommendedRules.ruleset + true MinimumRecommendedRules.ruleset $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\AutoUpdater\ + $(Configuration).vs140\$(Platform)\CAutoUpdater\ $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\AutoUpdater\ + $(Configuration).vs140\$(Platform)\CAutoUpdater\ false MinimumRecommendedRules.ruleset @@ -100,7 +102,7 @@ MinimumRecommendedRules.ruleset - $(Configuration).vs140\$(Platform)\AutoUpdater\ + $(Configuration).vs140\$(Platform)\CAutoUpdater\ $(SolutionDir)$(Configuration).vs140\$(Platform)\ @@ -111,14 +113,14 @@ Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL true NotUsing Level3 - ProgramDatabase + EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -142,6 +144,7 @@ Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -173,11 +176,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -202,11 +205,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -239,14 +242,14 @@ - - + + - + - + @@ -256,4 +259,4 @@ - \ No newline at end of file + diff --git a/msvc/CAutoUpdater.vs140.vcxproj.filters b/msvc/CAutoUpdater.vs140.vcxproj.filters index 45ef7c2..ecec3e5 100644 --- a/msvc/CAutoUpdater.vs140.vcxproj.filters +++ b/msvc/CAutoUpdater.vs140.vcxproj.filters @@ -54,10 +54,10 @@ Header Files\core - + Header Files - + Header Files @@ -68,12 +68,12 @@ - + Source Files - + Resource Files diff --git a/msvc/CAutoUpdater.vs160.vcxproj b/msvc/CAutoUpdater.vs160.vcxproj index 7097f1d..2319935 100644 --- a/msvc/CAutoUpdater.vs160.vcxproj +++ b/msvc/CAutoUpdater.vs160.vcxproj @@ -75,7 +75,7 @@ $(SolutionDir)$(Configuration).vs160\$(Platform)\ - $(Configuration).vs160\$(Platform)\AutoUpdater\ + $(Configuration).vs160\$(Platform)\CAutoUpdater\ true MinimumRecommendedRules.ruleset @@ -87,11 +87,11 @@ $(SolutionDir)$(Configuration).vs160\$(Platform)\ - $(Configuration).vs160\$(Platform)\AutoUpdater\ + $(Configuration).vs160\$(Platform)\CAutoUpdater\ $(SolutionDir)$(Configuration).vs160\$(Platform)\ - $(Configuration).vs160\$(Platform)\AutoUpdater\ + $(Configuration).vs160\$(Platform)\CAutoUpdater\ false MinimumRecommendedRules.ruleset @@ -102,7 +102,7 @@ MinimumRecommendedRules.ruleset - $(Configuration).vs160\$(Platform)\AutoUpdater\ + $(Configuration).vs160\$(Platform)\CAutoUpdater\ $(SolutionDir)$(Configuration).vs160\$(Platform)\ @@ -242,14 +242,14 @@ - - + + - + - + diff --git a/msvc/CAutoUpdater.vs160.vcxproj.filters b/msvc/CAutoUpdater.vs160.vcxproj.filters index 45ef7c2..ecec3e5 100644 --- a/msvc/CAutoUpdater.vs160.vcxproj.filters +++ b/msvc/CAutoUpdater.vs160.vcxproj.filters @@ -54,10 +54,10 @@ Header Files\core - + Header Files - + Header Files @@ -68,12 +68,12 @@ - + Source Files - + Resource Files diff --git a/msvc/CAutoUpdater.vs160.vcxproj.user b/msvc/CAutoUpdater.vs160.vcxproj.user index 88a5509..6dfebbc 100644 --- a/msvc/CAutoUpdater.vs160.vcxproj.user +++ b/msvc/CAutoUpdater.vs160.vcxproj.user @@ -1,4 +1,7 @@  - + + -K public.pem force + WindowsLocalDebugger + \ No newline at end of file diff --git a/msvc/CAutoUpdater.vs90.vcproj b/msvc/CAutoUpdater.vs90.vcproj deleted file mode 100644 index 858435c..0000000 --- a/msvc/CAutoUpdater.vs90.vcproj +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/TLibappupdater.vs140.vcxproj b/msvc/KeyGen.vs140.vcxproj similarity index 88% rename from msvc/TLibappupdater.vs140.vcxproj rename to msvc/KeyGen.vs140.vcxproj index b1fb0b2..42fce0b 100644 --- a/msvc/TLibappupdater.vs140.vcxproj +++ b/msvc/KeyGen.vs140.vcxproj @@ -19,9 +19,9 @@ - TLibappupdater - {DFB46FDD-20AF-4044-AFE8-46A3218C5081} - TLibappupdater + KeyGen + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2} + KeyGen MFCProj 8.1 @@ -29,28 +29,28 @@ Application v140 - Dynamic + false Unicode true Application v140 - Dynamic + false Unicode true Application v140 - Dynamic + false false Unicode Application v140 - Dynamic + false false Unicode @@ -75,7 +75,7 @@ $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\TLibappupdater\ + $(Configuration).vs140\$(Platform)\KeyGen\ true MinimumRecommendedRules.ruleset @@ -87,11 +87,11 @@ $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\TLibappupdater\ + $(Configuration).vs140\$(Platform)\KeyGen\ $(SolutionDir)$(Configuration).vs140\$(Platform)\ - $(Configuration).vs140\$(Platform)\TLibappupdater\ + $(Configuration).vs140\$(Platform)\KeyGen\ false MinimumRecommendedRules.ruleset @@ -102,7 +102,7 @@ MinimumRecommendedRules.ruleset - $(Configuration).vs140\$(Platform)\TLibappupdater\ + $(Configuration).vs140\$(Platform)\KeyGen\ $(SolutionDir)$(Configuration).vs140\$(Platform)\ @@ -113,14 +113,14 @@ Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL true NotUsing Level3 - ProgramDatabase + EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -144,6 +144,7 @@ Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -175,11 +176,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -204,11 +205,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -227,14 +228,24 @@ - + + + + + + + + + + + - + - \ No newline at end of file + diff --git a/msvc/TLibappupdater.vs140.vcxproj.filters b/msvc/KeyGen.vs140.vcxproj.filters similarity index 55% rename from msvc/TLibappupdater.vs140.vcxproj.filters rename to msvc/KeyGen.vs140.vcxproj.filters index 3dee2fb..f798d2d 100644 --- a/msvc/TLibappupdater.vs140.vcxproj.filters +++ b/msvc/KeyGen.vs140.vcxproj.filters @@ -15,7 +15,29 @@ - + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + Source Files diff --git a/msvc/KeyGen.vs160.vcxproj b/msvc/KeyGen.vs160.vcxproj new file mode 100644 index 0000000..9f2d583 --- /dev/null +++ b/msvc/KeyGen.vs160.vcxproj @@ -0,0 +1,251 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + KeyGen + {A1BE9C67-2A56-41BC-A518-76C03C53FCF2} + KeyGen + MFCProj + 8.1 + + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + false + Unicode + + + Application + v142 + false + false + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\KeyGen\ + true + MinimumRecommendedRules.ruleset + + + + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\KeyGen\ + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\KeyGen\ + false + MinimumRecommendedRules.ruleset + + + + + false + MinimumRecommendedRules.ruleset + + + $(Configuration).vs160\$(Platform)\KeyGen\ + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + + + + _DEBUG;%(PreprocessorDefinitions) + false + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/KeyGen.vs160.vcxproj.filters b/msvc/KeyGen.vs160.vcxproj.filters new file mode 100644 index 0000000..f798d2d --- /dev/null +++ b/msvc/KeyGen.vs160.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {4FC737F1-C7A5-4376-88EB-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/msvc/NSRes.vs140.vcxproj b/msvc/NSRes.vs140.vcxproj index a52cb97..20a28bf 100644 --- a/msvc/NSRes.vs140.vcxproj +++ b/msvc/NSRes.vs140.vcxproj @@ -231,14 +231,14 @@ - + - + - - + + @@ -248,4 +248,4 @@ - \ No newline at end of file + diff --git a/msvc/NSRes.vs140.vcxproj.filters b/msvc/NSRes.vs140.vcxproj.filters index 62b3c51..c9de62b 100644 --- a/msvc/NSRes.vs140.vcxproj.filters +++ b/msvc/NSRes.vs140.vcxproj.filters @@ -18,7 +18,7 @@ - + Header Files @@ -32,16 +32,16 @@ - + Resource Files - + Source Files - + Source Files - \ No newline at end of file + diff --git a/msvc/NSRes.vs160.vcxproj b/msvc/NSRes.vs160.vcxproj index dc0c623..98d24eb 100644 --- a/msvc/NSRes.vs160.vcxproj +++ b/msvc/NSRes.vs160.vcxproj @@ -231,14 +231,14 @@ - + - + - - + + @@ -248,4 +248,4 @@ - \ No newline at end of file + diff --git a/msvc/NSRes.vs160.vcxproj.filters b/msvc/NSRes.vs160.vcxproj.filters index 62b3c51..b7a6bb1 100644 --- a/msvc/NSRes.vs160.vcxproj.filters +++ b/msvc/NSRes.vs160.vcxproj.filters @@ -18,7 +18,7 @@ - + Header Files @@ -32,16 +32,16 @@ - + Resource Files - + Source Files Source Files - \ No newline at end of file + diff --git a/msvc/SignTool.vs140.vcxproj b/msvc/SignTool.vs140.vcxproj new file mode 100644 index 0000000..94bb3e1 --- /dev/null +++ b/msvc/SignTool.vs140.vcxproj @@ -0,0 +1,255 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SignTool + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2} + KeyGen + MFCProj + 8.1 + + + + Application + v140 + false + Unicode + true + + + Application + v140 + false + Unicode + true + + + Application + v140 + false + false + Unicode + + + Application + v140 + false + false + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Configuration).vs140\$(Platform)\ + $(Configuration).vs140\$(Platform)\SignTool\ + true + MinimumRecommendedRules.ruleset + + + + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)$(Configuration).vs140\$(Platform)\ + $(Configuration).vs140\$(Platform)\SigTool\ + + + $(SolutionDir)$(Configuration).vs140\$(Platform)\ + $(Configuration).vs140\$(Platform)\SignTool\ + false + MinimumRecommendedRules.ruleset + + + + + false + MinimumRecommendedRules.ruleset + + + $(Configuration).vs140\$(Platform)\SignTool\ + $(SolutionDir)$(Configuration).vs140\$(Platform)\ + + + + _DEBUG;%(PreprocessorDefinitions) + false + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs140\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + + $(SolutionDir)\$(Configuration).vs140\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs140\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + + $(SolutionDir)\$(Configuration).vs140\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/SignTool.vs140.vcxproj.filters b/msvc/SignTool.vs140.vcxproj.filters new file mode 100644 index 0000000..5146a15 --- /dev/null +++ b/msvc/SignTool.vs140.vcxproj.filters @@ -0,0 +1,56 @@ + + + + + {4FC737F1-C7A5-4376-88EB-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/msvc/SignTool.vs160.vcxproj b/msvc/SignTool.vs160.vcxproj new file mode 100644 index 0000000..ed4a1b0 --- /dev/null +++ b/msvc/SignTool.vs160.vcxproj @@ -0,0 +1,255 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SignTool + {A1BE9C67-1B56-41BC-A518-76C03C53FCF2} + SignTool + MFCProj + 8.1 + + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + false + Unicode + + + Application + v142 + false + false + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\SignTool\ + true + MinimumRecommendedRules.ruleset + + + + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\SigTool\ + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\SignTool\ + false + MinimumRecommendedRules.ruleset + + + + + false + MinimumRecommendedRules.ruleset + + + $(Configuration).vs160\$(Platform)\SignTool\ + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + + + + _DEBUG;%(PreprocessorDefinitions) + false + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/SignTool.vs160.vcxproj.filters b/msvc/SignTool.vs160.vcxproj.filters new file mode 100644 index 0000000..5146a15 --- /dev/null +++ b/msvc/SignTool.vs160.vcxproj.filters @@ -0,0 +1,56 @@ + + + + + {4FC737F1-C7A5-4376-88EB-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/msvc/TAutoUpdater.vs140.vcxproj b/msvc/TAutoUpdater.vs140.vcxproj index 737867a..b0a8146 100644 --- a/msvc/TAutoUpdater.vs140.vcxproj +++ b/msvc/TAutoUpdater.vs140.vcxproj @@ -29,28 +29,28 @@ Application v140 - Dynamic + false Unicode true Application v140 - Dynamic + false Unicode true Application v140 - Dynamic + false false Unicode Application v140 - Dynamic + false false Unicode @@ -113,14 +113,14 @@ Disabled - WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true NotUsing Level3 - ProgramDatabase + EditAndContinue _DEBUG;%(PreprocessorDefinitions) @@ -144,6 +144,7 @@ Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -175,11 +176,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -204,11 +205,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - false MultiThreadedDLL NotUsing Level3 ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -227,29 +228,16 @@ - - - - - - - - - - - - - - - - + + + - - + - + + @@ -259,4 +247,4 @@ - \ No newline at end of file + diff --git a/msvc/TAutoUpdater.vs140.vcxproj.filters b/msvc/TAutoUpdater.vs140.vcxproj.filters index aa7359f..bd90997 100644 --- a/msvc/TAutoUpdater.vs140.vcxproj.filters +++ b/msvc/TAutoUpdater.vs140.vcxproj.filters @@ -13,71 +13,29 @@ {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {2635ebd6-b340-4d41-b979-d4a5b751c863} - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - + Header Files - - Header Files\core - - - Header Files\core + + Header Files - + Header Files - + + Resource Files + + + + Source Files - + Source Files - - - Resource Files - - - \ No newline at end of file + diff --git a/msvc/TAutoUpdater.vs160.vcxproj b/msvc/TAutoUpdater.vs160.vcxproj index 18b8cc6..79f9026 100644 --- a/msvc/TAutoUpdater.vs160.vcxproj +++ b/msvc/TAutoUpdater.vs160.vcxproj @@ -114,7 +114,7 @@ Disabled $(SolutionDir)\expat;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_DEBUG;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -228,30 +228,16 @@ - - - - - - - - - - - - - - - - - + + + - + - - + + @@ -261,4 +247,4 @@ - \ No newline at end of file + diff --git a/msvc/TAutoUpdater.vs160.vcxproj.filters b/msvc/TAutoUpdater.vs160.vcxproj.filters index a402ed4..bd90997 100644 --- a/msvc/TAutoUpdater.vs160.vcxproj.filters +++ b/msvc/TAutoUpdater.vs160.vcxproj.filters @@ -13,73 +13,28 @@ {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {2635ebd6-b340-4d41-b979-d4a5b751c863} - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - + Header Files - - Header Files\core - - - Header Files\core + + Header Files - + Header Files - + Resource Files - + Source Files - + Source Files diff --git a/msvc/TAutoUpdater.vs160.vcxproj.user b/msvc/TAutoUpdater.vs160.vcxproj.user index 53625d8..9616f35 100644 --- a/msvc/TAutoUpdater.vs160.vcxproj.user +++ b/msvc/TAutoUpdater.vs160.vcxproj.user @@ -5,7 +5,7 @@ WindowsLocalDebugger - -v prompt + -K mc-public-version1.pem force WindowsLocalDebugger \ No newline at end of file diff --git a/msvc/TAutoUpdater.vs90.vcproj b/msvc/TAutoUpdater.vs90.vcproj deleted file mode 100644 index 42d69be..0000000 --- a/msvc/TAutoUpdater.vs90.vcproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/UpdateTool.vs160.vcxproj b/msvc/UpdateTool.vs160.vcxproj new file mode 100644 index 0000000..7fec742 --- /dev/null +++ b/msvc/UpdateTool.vs160.vcxproj @@ -0,0 +1,253 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + UpdateTool + {A1BE9C67-1B56-41BC-A518-76C03C53FC42} + UpdateTool + MFCProj + 8.1 + + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + Unicode + true + + + Application + v142 + false + false + Unicode + + + Application + v142 + false + false + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\UpdateTool\ + true + MinimumRecommendedRules.ruleset + + + + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\SigTool\ + + + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\UpdateTool\ + false + MinimumRecommendedRules.ruleset + + + + + false + MinimumRecommendedRules.ruleset + + + $(Configuration).vs160\$(Platform)\UpdateTool\ + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + + + + _DEBUG;%(PreprocessorDefinitions) + false + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + NotUsing + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + version.lib wininet.lib %(AdditionalOptions) + true + Console + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + MachineX86 + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + WIN32;_WINDOWS;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDLL + NotUsing + Level3 + ProgramDatabase + $(SolutionDir)\expat;%(AdditionalIncludeDirectories) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + + + true + Console + true + true + false + + + $(SolutionDir)\$(Configuration).vs160\$(Platform)\libappupdater.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/UpdateTool.vs160.vcxproj.filters b/msvc/UpdateTool.vs160.vcxproj.filters new file mode 100644 index 0000000..fe9c758 --- /dev/null +++ b/msvc/UpdateTool.vs160.vcxproj.filters @@ -0,0 +1,50 @@ + + + + + {4FC737F1-C7A5-4376-88EB-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-9B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/msvc/libappupdater.vs140.vcxproj b/msvc/libappupdater.vs140.vcxproj index b41d5aa..38567a1 100644 --- a/msvc/libappupdater.vs140.vcxproj +++ b/msvc/libappupdater.vs140.vcxproj @@ -19,10 +19,20 @@ + + + + + + + + + + + + - -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) - -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) @@ -36,7 +46,9 @@ + + @@ -59,6 +71,15 @@ + + + + + + + + + @@ -83,11 +104,14 @@ + + + - + @@ -98,19 +122,15 @@ - - - - + - - {78313210-0B94-4914-87A7-D76EBD85B7F9} + {EBA010B5-F14F-4AED-9E6B-D519BACD1615} AutoUpdater Win32Proj 8.1 @@ -165,10 +185,10 @@ $(SolutionDir)$(Configuration).vs140\$(Platform)\ $(Configuration).vs140\$(Platform)\libappupdater\ - libappupdater.vs140.1.0.1 + libappupdater.vs140.1.0.3 - libappupdater.vs140.1.0.1 + libappupdater.vs140.1.0.3 $(SolutionDir)$(Configuration).vs140\$(Platform)\ $(Configuration).vs140\$(Platform)\libappupdater\ @@ -176,25 +196,25 @@ $(SolutionDir)$(Configuration).vs140\$(Platform)\ $(Configuration).vs140\$(Platform)\libappupdater\ false - libappupdater.vs140.1.0.1 + libappupdater.vs140.1.0.3 false - libappupdater.vs140.1.0.1 + libappupdater.vs140.1.0.3 $(Configuration).vs140\$(Platform)\libappupdater\ $(SolutionDir)$(Configuration).vs140\$(Platform)\ Disabled - $(ProjectDir)\..\src;$(ProjectDir)\..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE - true + $(ProjectDir)..\src;$(ProjectDir)..\expat;%(AdditionalIncludeDirectories) + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL EnableFastChecks MultiThreadedDebugDLL - Level3 - ProgramDatabase + Level4 + EditAndContinue + /wd4100 /wd4127 /wd4701 %(AdditionalOptions) $(OutDir)$(TargetName)$(TargetExt) @@ -216,14 +236,15 @@ Disabled - $(ProjectDir)\..\src;$(ProjectDir)\..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE + $(SolutionDir)\src;$(SolutionDir)\expat;%(AdditionalIncludeDirectories) + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL EnableFastChecks MultiThreadedDebugDLL Level3 ProgramDatabase + /wd4100 /wd4127 /wd4701 %(AdditionalOptions) $(OutDir)$(TargetName)$(TargetExt) @@ -235,7 +256,6 @@ Windows - mfc140ud.lib;mfcs140ud.lib;%(AdditionalDependencies) $(OutDir)libappupdater.lib @@ -247,13 +267,14 @@ MaxSpeed true - $(ProjectDir)\..\src;$(ProjectDir)\..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE + $(ProjectDir)..\src;$(ProjectDir)..\expat;%(AdditionalIncludeDirectories) + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL MultiThreadedDLL true Level3 ProgramDatabase + /wd4100 /wd4127 /wd4701 %(AdditionalOptions) true @@ -268,21 +289,21 @@ MaxSpeed true - $(ProjectDir)\..\src;$(ProjectDir)\..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE + $(SolutionDir)\src;$(SolutionDir)\expat;%(AdditionalIncludeDirectories) + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL MultiThreadedDLL true Level3 ProgramDatabase + /wd4100 /wd4127 /wd4701 %(AdditionalOptions) true Windows true true - mfc140u.lib;mfcs140u.lib;%(AdditionalDependencies) $(OutDir)libappupdater.lib @@ -294,4 +315,4 @@ - \ No newline at end of file + diff --git a/msvc/libappupdater.vs140.vcxproj.filters b/msvc/libappupdater.vs140.vcxproj.filters index 3e2e39e..ff4bc6e 100644 --- a/msvc/libappupdater.vs140.vcxproj.filters +++ b/msvc/libappupdater.vs140.vcxproj.filters @@ -26,16 +26,37 @@ {22c5ad38-683c-4a82-9f8b-9bb58267213c} - {0fbba1d4-457d-4c8e-b165-e55f2d8a6234} + {38a878ed-7e74-4854-8781-8db434d14df1} - {274f6161-4730-47ad-897a-a6ca0fc377ec} + {decd7815-4440-4018-85b1-bd18aedb5834} - {d30d5324-ad41-4dbc-a2fa-54f960a43d23} + {bf59cbf9-438a-4170-9754-c2fc66cbd620} + + + {fbd63120-c8cc-4eae-b104-461796b7709f} + + + {6c568c15-e086-42d9-ad0c-1a3bc3e20abc} + + + {433615b9-2e20-4cd3-b46c-a86e676987b7} + + + {0e9d69c7-54fa-4377-8d90-a18382f7c75f} + + + {78074deb-72f2-4cb7-90c6-cd1e2149c7e1} + + + {52640e8c-d716-45d6-a972-c86b62c8c7eb} + + Source Files\expat + Source Files\expat @@ -78,6 +99,9 @@ Source Files\core + + Source Files + Source Files\core @@ -87,29 +111,65 @@ Source Files\core - - Source Files - Source Files\localisation - - Source Files\localisation - Source Files\localisation Source Files\localisation + + Source Files\localisation + Source Files\localisation Source Files\localisation\test - - Source Files\expat + + Source Files\cjson + + + Source Files\cjson + + + Source Files\core + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\core @@ -196,6 +256,9 @@ Header Files\core + + Header Files\core + Header Files\core @@ -241,31 +304,55 @@ Header Files\core - - Header Files\core - - - Header Files\localisation - Header Files\localisation Header Files\localisation + + Header Files\localisation + Header Files\localisation - - Header Files\core + + Header Files\cjson - + + Header Files\cjson + + Header Files\core - + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + Header Files\core - + + Header Files\util + + Header Files\core @@ -273,8 +360,5 @@ Resource Files - - Source Files\localisation - \ No newline at end of file diff --git a/msvc/libappupdater.vs160.vcxproj b/msvc/libappupdater.vs160.vcxproj index da07f4b..58fb53a 100644 --- a/msvc/libappupdater.vs160.vcxproj +++ b/msvc/libappupdater.vs160.vcxproj @@ -21,6 +21,16 @@ + + + + + + + + + + -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) -DXML_STATIC;-DCOMPILED_FROM_DSP;%(PreprocessorDefinitions) @@ -36,6 +46,7 @@ + @@ -62,6 +73,13 @@ + + + + + + + @@ -86,8 +104,10 @@ + + @@ -104,6 +124,7 @@ + @@ -162,24 +183,24 @@ <_ProjectFileVersion>14.0.25431.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(ProjectName) + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\libappupdater\ + libappupdater.vs160.1.0.3 - libappupdater.vs160.1.0.1 + libappupdater.vs160.1.0.3 $(SolutionDir)$(Configuration).vs160\$(Platform)\ $(Configuration).vs160\$(Platform)\libappupdater\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(SolutionDir)$(Configuration).vs160\$(Platform)\ + $(Configuration).vs160\$(Platform)\libappupdater\ false - $(ProjectName) + libappupdater.vs160.1.0.3 false - libappupdater.vs160.1.0.1 + libappupdater.vs160.1.0.3 $(Configuration).vs160\$(Platform)\libappupdater\ $(SolutionDir)$(Configuration).vs160\$(Platform)\ @@ -187,7 +208,7 @@ Disabled $(ProjectDir)..\src;$(ProjectDir)..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL EnableFastChecks MultiThreadedDebugDLL @@ -216,7 +237,7 @@ Disabled $(SolutionDir)\src;$(SolutionDir)\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;_DEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL EnableFastChecks MultiThreadedDebugDLL @@ -247,7 +268,7 @@ MaxSpeed true $(ProjectDir)..\src;$(ProjectDir)..\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL MultiThreadedDLL true @@ -269,7 +290,7 @@ MaxSpeed true $(SolutionDir)\src;$(SolutionDir)\expat;%(AdditionalIncludeDirectories) - BUILDING_LIBAUTOUPDATER;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL + BUILDING_LIBAUTOUPDATER;ED25519_BUILD_DLL;WIN32;NDEBUG;XML_STATIC;COMPILED_FROM_DSP;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;_AFXDLL MultiThreadedDLL true diff --git a/msvc/libappupdater.vs160.vcxproj.filters b/msvc/libappupdater.vs160.vcxproj.filters index 530123f..ff4bc6e 100644 --- a/msvc/libappupdater.vs160.vcxproj.filters +++ b/msvc/libappupdater.vs160.vcxproj.filters @@ -40,6 +40,18 @@ {6c568c15-e086-42d9-ad0c-1a3bc3e20abc} + + {433615b9-2e20-4cd3-b46c-a86e676987b7} + + + {0e9d69c7-54fa-4377-8d90-a18382f7c75f} + + + {78074deb-72f2-4cb7-90c6-cd1e2149c7e1} + + + {52640e8c-d716-45d6-a972-c86b62c8c7eb} + @@ -126,6 +138,39 @@ Source Files\core + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\ed25519 + + + Source Files\core + @@ -280,6 +325,36 @@ Header Files\core + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\ed25519 + + + Header Files\core + + + Header Files\util + + + Header Files\core + diff --git a/msvc/libappupdater.vs90.vcproj b/msvc/libappupdater.vs90.vcproj deleted file mode 100644 index 6e9d764..0000000 --- a/msvc/libappupdater.vs90.vcproj +++ /dev/null @@ -1,427 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sign/signature.cpp b/sign/signature.cpp deleted file mode 100644 index bb2094d..0000000 --- a/sign/signature.cpp +++ /dev/null @@ -1,243 +0,0 @@ -// $Id: signature.cpp,v 1.10 2023/10/24 13:56:23 cvsuser Exp $ -// -// AutoUpdater: Manifest generation tool. -// - -#if !defined(_CRT_SECURE_NO_WARNINGS) -#define _CRT_SECURE_NO_WARNINGS -#endif - -#include -#include -#include - -#include -#include - -#include - -#if defined(PRAGMA_COMMENT_LIB) -#pragma comment(lib, "Advapi32.lib") // Cypt.h -#pragma comment(lib, "User32.lib") // MessageBox -#endif - -static std::string Signature(HANDLE hFile, const char *filename, int type); -static const char *Basename(const char *name); -static std::string SysError(const char *message, DWORD dwError = GetLastError()); -static const char *ReplaceString(const char *str, const char *orig, const char *rep, char *buffer, size_t buflen); - -#if defined(__WATCOMC__) && (__WATCOMC__ <= 1300) -/*missing string operators*/ -std::ostream& operator<<(std::ostream &stream, const std::string &s); -inline std::ostream& operator<<(std::ostream &stream, const std::string &s) { - stream.write(s.c_str(), s.length()); return stream; -} -#endif //__WATCOMC__ - - -// Function: Manifest -// Generate the manifest signature for the specified installer image. -// -// Parameters: -// filename - Installer exe image. -// version - Version label. -// -// Returns: -// nothing -// -void -sign_manifest(const char *filename, const char *version, const char *hosturl) -{ - HANDLE hFile = 0; - - try { - if (INVALID_HANDLE_VALUE == (hFile = CreateFileA(filename, - GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL))) { - throw std::runtime_error(SysError("Unable to open source file")); - } - - const char *basename = Basename(filename); - char url[1024] = {0}; - - ReplaceString(hosturl, "%%", basename, url, sizeof(url)); - - DWORD fileSize = GetFileSize(hFile, NULL); - const std::string sha = Signature(hFile, filename, CALG_SHA); - const std::string md5 = Signature(hFile, filename, CALG_MD5); - -#if defined(__MINGW64_VERSION_MAJOR) - const __time64_t now = _time64(NULL); -#else - const time_t now = time(NULL); -#endif - struct tm pubtime = {0}; - char pubDate[32] = {0}; - -#if defined(__WATCOMC__) - _localtime(&now, &pubtime); /* Wed, 01 Jan 2006 12:20:11 +0000 */ -#else - _localtime64_s(&pubtime, &now); /* Wed, 01 Jan 2006 12:20:11 +0000 */ -#endif - strftime(pubDate, sizeof(pubDate), "%a, %d %b %Y %H:%M:%S +0000", &pubtime); - - std::cout - << "\n" - << "\t\n" - << "\t\n" - << "\t\n" - << "\t" << now << "\n" - << "\t" << pubDate << "\n" - << "\t\n" - << "\n"; - - } catch (std::exception &e) { - std::string msg; - msg += "An error occurred during signature operations\n\n"; - msg += e.what(); - MessageBoxA(NULL, msg.c_str(), "Signature", MB_ICONWARNING | MB_OK); - - } catch(...) { - const char *msg = "An unknown error occurred during updater operations\n"; - MessageBoxA(NULL, msg, "Signature", MB_ICONERROR | MB_OK); - } - - CloseHandle(hFile); -} - - -// Function: Signature -// Generate the manifest signature for the specified installer image. -// -// Parameters: -// hFile - Image file handle. -// filename - Filename of installer image. -// type - Signature type (CALG_SHA, CALG_MD5). -// -// Returns: -// String containing the signature. -// -static std::string -Signature(HANDLE hFile, const char * /*filename*/, int type) -{ - BYTE ioBuffer[8 * 1024]; // io buffer - HCRYPTPROV hProv = 0; - HCRYPTHASH hHash = 0; - BOOL ioResult = FALSE; - DWORD ioSize = 0; - - // Get handle to the crypto provider - if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) || - !CryptCreateHash(hProv, type, 0, 0, &hHash)) { - DWORD dwStatus = GetLastError(); - if (hProv) CryptReleaseContext(hProv, 0); - throw std::runtime_error(SysError("CryptAcquireContext failed.", dwStatus)); - } - - // Calculate hash - if (INVALID_SET_FILE_POINTER == SetFilePointer(hFile, 0, 0, FILE_BEGIN)) { - throw std::runtime_error(SysError("Cannot read exe image.")); - } - - while ((ioResult = ReadFile(hFile, ioBuffer, sizeof(ioBuffer), &ioSize, NULL)) != FALSE) { - if (0 == ioSize) { - break; // EOF - } - if (! CryptHashData(hHash, ioBuffer, ioSize, 0)) { - DWORD dwStatus = GetLastError(); - CryptReleaseContext(hProv, 0); - CryptDestroyHash(hHash); - throw std::runtime_error(SysError("CryptHashData failed.", dwStatus)); - } - } - if (!ioResult) { - DWORD dwStatus = GetLastError(); - CryptReleaseContext(hProv, 0); - CryptDestroyHash(hHash); - throw std::runtime_error(SysError("Cannot read exe image.", dwStatus)); - } - - const char hashDigits[] = "0123456789abcdef"; - BYTE hashBuffer[20] = {0}; // 16=MD5,20=SHA - DWORD hashSize = sizeof(hashBuffer); - std::string hash; - - if (CryptGetHashParam(hHash, HP_HASHVAL, hashBuffer, &hashSize, 0)) { - for (DWORD i = 0; i < hashSize; i++) { - hash += hashDigits[hashBuffer[i] >> 4]; - hash += hashDigits[hashBuffer[i] & 0xf]; - } - } else { - throw std::runtime_error(SysError("CryptGetHashParam failed.")); - } - - CryptDestroyHash(hHash); - CryptReleaseContext(hProv, 0); - return hash; -} - - -static const char * -Basename(const char *filename) -{ - const char *name; - return (NULL != (name = strrchr(filename, '/'))) - || (NULL != (name = strrchr(filename, '\\'))) ? name + 1 : filename; -} - - -static std::string -SysError(const char *message, DWORD dwError) -{ - std::string msg; - LPSTR buf; - - if (message && *message) { - msg = message, msg += ":\n\n"; - } - if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - 0, dwError, 0, (LPSTR)&buf, 0, NULL)) { - msg += buf; - LocalFree(buf); - } - return msg; -} - - -static const char * -ReplaceString(const char *str, const char *orig, const char *rep, char *buffer, size_t buflen) -{ - size_t leading; - const char *p; - - if (NULL == (p = strstr(str, orig))) { -#if defined(__WATCOMC__) - std::snprintf(buffer, buflen, "%s", str); -#else - _snprintf(buffer, buflen, "%s", str); -#endif - return buffer; - } - - if ((leading = p - str) >= buflen) { - strncpy(buffer, str, buflen); - - } else { - strncpy(buffer, str, leading); -#if defined(__WATCOMC__) - std::snprintf(buffer + leading, buflen - leading, "%s%s", rep, p + strlen(orig)); -#else - _snprintf(buffer + leading, buflen - leading, "%s%s", rep, p + strlen(orig)); -#endif - } - return buffer; -} - -/*end*/ - diff --git a/sign/signature.h b/sign/signature.h deleted file mode 100644 index 88522db..0000000 --- a/sign/signature.h +++ /dev/null @@ -1,5 +0,0 @@ -// -// AutoUpdater: manifest generation tool. -// - -void sign_manifest(const char *filename, const char *version, const char *hosturl); diff --git a/sign/signmanifest.cpp b/sign/signmanifest.cpp new file mode 100644 index 0000000..66c8775 --- /dev/null +++ b/sign/signmanifest.cpp @@ -0,0 +1,368 @@ +// $Id: signmanifest.cpp,v 1.4 2025/04/22 17:55:08 cvsuser Exp $ +// +// AutoUpdater: Manifest generation tool. +// +// This file is part of libautoupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2012 - 2025 Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if !defined(_CRT_SECURE_NO_WARNINGS) +#define _CRT_SECURE_NO_WARNINGS +#endif +#if !defined(NOMINMAX) +#define NOMINMAX +#endif + +#include +#include + +#include +#include +#include + +#include +#include + +#define WINDOWS_LEAN_AND_MEAN +#include + +#include "../libautoupdater.h" +#include "../ed25519/src/ed25519.h" + +#include "../util/Hex.h" +#include "../util/Base64.h" +#include "../util/Util.h" + +#include "signmanifest.h" + +#pragma comment(lib, "Advapi32.lib") // Cypt.h +#pragma comment(lib, "User32.lib") // MessageBox + +namespace { + + /////////////////////////////////////////////////////////////////////////// + // Support + + std::string + SysError(const char *message, DWORD dwError = GetLastError()) + { + std::string msg; + LPSTR buf; + + if (message && *message) { + msg = message, msg += ":\n\n"; + } + + if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + 0, dwError, 0, (LPSTR)&buf, 0, NULL)) { + msg += buf; + LocalFree(buf); + } + + return msg; + } + + const char * + ReplaceString(const char *str, const char *orig, const char *rep, char *buffer, size_t buflen) + { + size_t leading; + const char* p; + + if (NULL == (p = strstr(str, orig))) { +#if defined(__WATCOMC__) + std::snprintf(buffer, buflen, "%s", str); +#else + _snprintf(buffer, buflen, "%s", str); +#endif + return buffer; + } + + if ((leading = p - str) >= buflen) { + strncpy(buffer, str, buflen); + + } else { + strncpy(buffer, str, leading); +#if defined(__WATCOMC__) + std::snprintf(buffer + leading, buflen - leading, "%s%s", rep, p + strlen(orig)); +#else + _snprintf(buffer + leading, buflen - leading, "%s%s", rep, p + strlen(orig)); +#endif + } + return buffer; + } + + /////////////////////////////////////////////////////////////////////////// + // File object + + struct File { + File() : fileBuffer(NULL), fileSize(0) { + } + + void load(const char *filename) { + HANDLE hFile; + + if (INVALID_HANDLE_VALUE == (hFile = CreateFileA(filename, + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL))) { + throw std::runtime_error(SysError("Unable to open source image.")); + } + + LARGE_INTEGER t_fileSize; + BYTE *t_fileBuffer = NULL; + + if (! GetFileSizeEx(hFile, &t_fileSize) || t_fileSize.QuadPart == 0) { + throw std::runtime_error(SysError("Empty source image.")); + } + + if (t_fileSize.QuadPart >= INT_MAX) { + throw std::runtime_error(SysError("Source image exceeds 2GB.")); + } + + fileSize = t_fileSize.LowPart; + + if (NULL == (t_fileBuffer = static_cast(malloc(fileSize)))) { + throw std::runtime_error(SysError("Memory allocation error.")); + } + + DWORD ioSize = 0; + + if (INVALID_SET_FILE_POINTER == SetFilePointer(hFile, 0, 0, FILE_BEGIN) || + ! ReadFile(hFile, t_fileBuffer, fileSize, &ioSize, NULL) || ioSize != fileSize) { + throw std::runtime_error(SysError("Cannot read source image.", GetLastError())); + } + + fileBuffer = t_fileBuffer; + CloseHandle(hFile); + } + + ~File() { + free((void*)fileBuffer); + } + + const BYTE *fileBuffer; + DWORD fileSize; + }; + +}; // namespace anon + + +static std::string Hash(const File &file, int type); +static std::string Sign(const File &file, const struct SignKeyPair *key); + +#if defined(__WATCOMC__) && (__WATCOMC__ <= 1300) +/*missing string operators*/ +std::ostream& operator<<(std::ostream &stream, const std::string &s); +inline std::ostream& operator<<(std::ostream &stream, const std::string &s) { + stream.write(s.c_str(), s.length()); return stream; +} +#endif //__WATCOMC__ + + +// Function: Manifest +// Generate the manifest signature for the specified installer image. +// +// Parameters: +// filename - Installer image. +// version - Version label. +// url - URL to manifest. +// +// Returns: +// nothing +// + +void +SignManifest(const char *filename, const char *version, const char *url) +{ + SignManifestEd(filename, version, url, NULL, 0); +} + + +// Function: Manifest +// Generate the manifest signature for the specified installer image. +// +// Parameters: +// filename - Installer image. +// version - Version label. +// url - URL to manifest. +// keypair - Key-pair. +// keyversion - KeyVersion. +// +// Returns: +// nothing +// + +void +SignManifestEd(const char *filename, const char *version, const char *url, + const struct SignKeyPair *keypair, unsigned keyversion) +{ + try { + const char *basename = Updater::Util::Basename(filename); + File file; + + file.load(filename); + + const std::string sha = Hash(file, CALG_SHA); + const std::string md5 = Hash(file, CALG_MD5); + const std::string dsa = (keypair ? Sign(file, keypair) : ""); + +#if defined(__MINGW64_VERSION_MAJOR) + const __time64_t now = _time64(NULL); +#else + const time_t now = time(NULL); +#endif + struct tm pubtime = {0}; + char pubDate[32] = {0}; + +#if defined(__WATCOMC__) + _localtime(&now, &pubtime); /* Wed, 01 Jan 2006 12:20:11 +0000 */ +#else + _localtime64_s(&pubtime, &now); /* Wed, 01 Jan 2006 12:20:11 +0000 */ +#endif + strftime(pubDate, sizeof(pubDate), "%a, %d %b %Y %H:%M:%S +0000", &pubtime); + + char url[1024] = {0}; + ReplaceString(url, "%%", basename, url, sizeof(url)); + + std::cout + << "\n" + << "\t\n" + << "\t\n" + << "\t\n" + << "\t" << now << "\n" + << "\t" << pubDate << "\n" + << "\t\n" + << "\n"; + + } catch (std::exception &e) { + std::string msg; + + msg += "An error occurred during signature operations\n\n"; + msg += e.what(); + MessageBoxA(NULL, msg.c_str(), "Signature", MB_ICONWARNING | MB_OK); + + } catch (...) { + const char *msg = "An unknown error occurred during updater operations\n"; + + MessageBoxA(NULL, msg, "Signature", MB_ICONERROR | MB_OK); + } +} + + +// Function: Hash +// Generate the manifest hash for the specified installer image. +// +// Parameters: +// hFile - Image file handle. +// filename - Filename of installer image. +// type - Signature type (CALG_SHA, CALG_MD5). +// +// Returns: +// String containing the signature. +// +static std::string +Hash(const File &file, int type) +{ + HCRYPTPROV hProv = 0; + HCRYPTHASH hHash = 0; + BOOL ioResult = FALSE; + + // Crypt provider handle + if (! CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) || + ! CryptCreateHash(hProv, type, 0, 0, &hHash)) { + DWORD dwStatus = GetLastError(); + if (hProv) CryptReleaseContext(hProv, 0); + throw std::runtime_error(SysError("CryptAcquireContext failed.", dwStatus)); + } + + // Calculate hash + if (! CryptHashData(hHash, file.fileBuffer, file.fileSize, 0)) { + DWORD dwStatus = GetLastError(); + CryptReleaseContext(hProv, 0); + CryptDestroyHash(hHash); + throw std::runtime_error(SysError("CryptHashData failed.", dwStatus)); + } + + // Export + BYTE hashBuffer[20] = {0}; // 16=MD5,20=SHA + DWORD hashSize = sizeof(hashBuffer); + std::string hash; + + if (CryptGetHashParam(hHash, HP_HASHVAL, hashBuffer, &hashSize, 0)) { + hash = Updater::Hex::to_string(hashBuffer, hashSize); + } else { + throw std::runtime_error(SysError("CryptGetHashParam failed.")); + } + + CryptDestroyHash(hHash); + CryptReleaseContext(hProv, 0); + return hash; +} + + +static std::string +Sign(const File& file, const struct SignKeyPair *key) +{ + uint8_t signature[ED25519_SIGNATURE_LENGTH] = {0}; + ed25519_sign(signature, file.fileBuffer, file.fileSize, key->public_key, key->private_key); + +#if !defined(NDEBUG) // verify unit-test + + // success + assert(1 == ed25519_verify(signature, file.fileBuffer, file.fileSize, key->public_key)); + { + size_t size = file.fileSize; + void *context; + + context = ed25519_verify_init(signature, key->public_key); + for (const BYTE *message = file.fileBuffer; size;) { + const size_t messagelen = (size > (8 * 1024) ? (8 * 1024) : size); + + ed25519_verify_update(context, message, messagelen); + message += messagelen; + size -= messagelen; + } + assert(1 == ed25519_verify_final(context)); + } + + // failure + { + uint8_t t_signature[sizeof(signature)] = { 0 }; + memcpy(t_signature, signature, sizeof(signature)); + t_signature[1] |= 1; + assert(1 != ed25519_verify(t_signature, file.fileBuffer, file.fileSize, key->public_key)); + } + assert(1 != ed25519_verify(signature, file.fileBuffer, file.fileSize - 1, key->public_key)); + +#endif //NDEBUG + + return Updater::Base64::encode_to_string(signature, sizeof(signature)); +} + +/*end*/ diff --git a/sign/signmanifest.h b/sign/signmanifest.h new file mode 100644 index 0000000..a393edd --- /dev/null +++ b/sign/signmanifest.h @@ -0,0 +1,42 @@ +// $Id: signmanifest.h,v 1.2 2025/04/21 19:02:11 cvsuser Exp $ +// +// AutoUpdater: manifest generation tool. +// +// This file is part of libautoupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2012 - 2025 Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if defined(__cplusplus) +extern "C" { +#endif + +struct SignKeyPair; + +void SignManifest(const char *filename, const char *version, const char *hosturl); +void SignManifestEd(const char *filename, const char *version, const char *hosturl, + const struct SignKeyPair *keypair, unsigned keyversion); + +#if defined(__cplusplus) +} +#endif + +//end diff --git a/sign/signtool.cpp b/sign/signtool.cpp new file mode 100644 index 0000000..780637f --- /dev/null +++ b/sign/signtool.cpp @@ -0,0 +1,42 @@ +// $Id: signtool.cpp,v 1.4 2025/04/22 17:24:04 cvsuser Exp $ +// +// AutoUpdater: Manifest generation tool. +// +// signtool - tool example. +// +// This file is part of libautoupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2012 - 2025 Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include "signtoolshim.h" + +int +main(int argc, char *argv[]) +{ + struct SignToolArgs args = {0}; + + args.progname = "signtool"; + + return SignToolShim(argc, argv, &args); +} + +//end diff --git a/sign/signtoolshim.cpp b/sign/signtoolshim.cpp new file mode 100644 index 0000000..c0c2299 --- /dev/null +++ b/sign/signtoolshim.cpp @@ -0,0 +1,293 @@ +// $Id: signtoolshim.cpp,v 1.5 2025/04/22 17:24:04 cvsuser Exp $ +// +// AutoUpdater: Manifest generation tool. +// +// This file is part of libautoupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2012 - 2025 Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if !defined(_CRT_SECURE_NO_WARNINGS) +#define _CRT_SECURE_NO_WARNINGS +#endif + +#include +#include +#include + +#include +#include + +#define WINDOWS_LEAN_AND_MEAN +#include + +#include "signtoolshim.h" +#include "signmanifest.h" + +#include "../libautoupdater.h" +#include "../util/upgetopt.h" +#include "../util/util.h" + +#pragma comment(lib, "Version.lib") + +static const char *progname = ""; + +static void Usage(const struct SignToolArgs &args); +static const char *ExeVersion(const char *executable, char *version, size_t versize); + + +// Function: SignToolShim +// Signtool application shim. +// +int +SignToolShim(int argc, char *argv[], const struct SignToolArgs *args) +{ + const char *options = (args->hosturlalt ? "H:AK:x:V:E:h" : "H:K:x:V:E:h"); + const char *private_pem = NULL; + const char *version = args->version, + *hosturl = args->hosturl; + const char *exename = NULL; + unsigned key_version = 1; + int ch; + + // arguments + progname = (args->progname ? args->progname : Updater::Util::Basename(argv[0])); + while (-1 != (ch = Updater::Getopt(argc, argv, options))) { + switch (ch) { + case 'H': // host URL template + hosturl = Updater::optarg; + break; + case 'A': // alternative host URL + hosturl = args->hosturlalt; + break; + case 'K': // private key + private_pem = Updater::optarg; + break; + case 'x': // key version; default 1 + key_version = static_cast(strtoul(Updater::optarg, NULL, 0)); + break; + case 'V': // application version + version = Updater::optarg; + break; + case 'E': // executable name + exename = Updater::optarg; + break; + case 'h': + default: + Usage(*args); + break; + } + } + + argv += Updater::optind; + if ((argc -= Updater::optind) < 1) { + std::cerr << "\n" << + progname << ": expected arguments []" << std::endl; + Usage(*args); + + } else if (argc > 2) { + std::cerr << "\n" << + progname << ": unexpected arguments '" << argv[2] << "' ..." << std::endl; + Usage(*args); + } + + if (version && exename) { + std::cerr << "\n" << + progname << ": -V and -E are mutually exclusive options." << std::endl; + Usage(*args); + } + + if (!hosturl || !*hosturl) { + std::cerr << "\n" << + progname << ": -H expected." << std::endl; + Usage(*args); + } + + // application inputs + char exeversion[64] = {0}; + const char *inputname = argv[0], *outputname = argv[1]; + size_t inputlen; + + if ((inputlen = strlen(inputname)) < 5 || + (0 != _stricmp(inputname + (inputlen - 4), ".exe") && + 0 != _stricmp(inputname + (inputlen - 4), ".msi"))) { + std::cerr << "\n" << + progname << ": should reference an installer image." << std::endl; + Usage(*args); + } + + if (outputname && 0 == strcmp(inputname, outputname)) { // optional + std::cerr << "\n" << + progname << ": and names must be different." << std::endl; + Usage(*args); + } + + // derive version + if (exename) { // optional executable name. + if (NULL != ExeVersion(exename, exeversion, sizeof(exeversion))) { + version = exeversion; + } + } + if (!version || !*version) { // otherwise query installer. + if (NULL != ExeVersion(inputname, exeversion, sizeof(exeversion))) { + version = exeversion; + } + } + if (!version || !*version) { + std::cerr << "\n" << + progname << ": -V required, no exe version information available." << std::endl; + Usage(*args); + } + + if (private_pem && 0 == key_version) { + std::cerr << "\n" << + progname << ": -x required, private key without version." << std::endl; + Usage(*args); + } + + // generate manifest + if (NULL != private_pem) { + if (0 != _access(private_pem, 0)) { + std::cout << "Private key <" << private_pem << "> not found.\n"; + return EXIT_FAILURE; + } + + struct SignKeyPair keypair = {0}; + + if (0 == ed25519_load_pem(private_pem, NULL, &keypair)) { + SignManifestEd(inputname, version, hosturl, &keypair, key_version); + } else { + std::cerr << "\n" << + progname << ": error reading key files." << std::endl; + return 1; + } + + } else { + SignManifest(inputname, version, hosturl); + } + return 0; +} + + +// Function: Usage +// Command line usage and exit. +// +static void +Usage(const struct SignToolArgs &args) +{ + const char *progtitle = + (args.progtitle && *args.progtitle ? args.progtitle : "AutoUpdater manifest generator"); + + std::cout.flush(); + std::cerr << + "\n"\ + << progtitle << ".\n"\ + "Engine Version (" << autoupdate_version_string() << ")\n"\ + "\n"\ + " " << progname << " [options] []\n"\ + "\n"\ + "Options:\n"\ + " -V Version label, form .\n"\ + " or -E otherwise installer path.\n"\ + "\n"; + + std::cerr << + " -H Explicit source URL"\ + ", default <" << (args.hosturl ? args.hosturl : "none") << ">.\n"; + + if (args.hosturlalt) + std::cerr << + " -A alternative source URL <" << args.hosturlalt << ">.\n"; + + std::cerr << + " -K Private key image, generates a Ed25519 signature.\n"\ + " -x KeyVersion, default <1>.\n"\ + "\n"\ + "Arguments:\n"\ + " input Name of the input file.\n"\ + " output Optional name of the results output file, otherwise stdout.\n"\ + "\n" << std::endl; + + exit(3); +} + + +// Function: ExeVersion +// Retrieve the executable version information. +// +static const char * +ExeVersion(const char *executable, char *version, size_t versize) +{ + char sub_block[2] = { '\\', '\0' }; + char path[MAX_PATH] = {0}; + void *vi = NULL, *sb = NULL; + DWORD visz, dummy; + UINT sbsz; + + // determine the size of the version info + if (! SearchPathA(NULL, executable, NULL, sizeof(path), path, NULL)) { + std::cerr << "Cannot find <" << executable << ">\n"; + return NULL; + } + + if (0 == (visz = GetFileVersionInfoSizeA(path, &dummy))) { + switch (GetLastError()) { + case ERROR_RESOURCE_TYPE_NOT_FOUND: + std::cerr << "<" << path << "> does not contain version info; this is probably an executable\n"; + break; + default: + std::cerr << "GetFileVersionInfoSize() failed : " << GetLastError() << "\n"; + break; + } + return NULL; + } + + if (NULL == (vi = (void *)GlobalAlloc(GMEM_FIXED, visz))) { + std::cerr << "Out of memory\n"; + return NULL; + } + + // retrieve the version info + if (! GetFileVersionInfoA(path, 0, visz, vi)) { + std::cerr << "GetFileVersionInfo() failed : " << GetLastError() << "\n"; + return NULL; + } + + // extract the VS_FIXEDFILEINFO from the version info + if (! VerQueryValueA(vi, sub_block, &sb, &sbsz)) { + std::cerr << "VerQueryValue() failed : " << GetLastError() << "\n"; + return NULL; + } + + const VS_FIXEDFILEINFO *ffi = (const VS_FIXEDFILEINFO *)sb; + if (ffi->dwProductVersionMS && ffi->dwProductVersionLS) { + _snprintf(version, versize, "%u.%u.%u.%u", + (HIWORD(ffi->dwProductVersionMS) & 0xFF), (LOWORD(ffi->dwProductVersionMS) & 0xFF), + (HIWORD(ffi->dwProductVersionLS) & 0xFF), (LOWORD(ffi->dwProductVersionLS) & 0xFF)); + } else { + version = NULL; + } + + GlobalFree(vi); + return version; +} + +//end diff --git a/sign/signtoolshim.h b/sign/signtoolshim.h new file mode 100644 index 0000000..f2f291f --- /dev/null +++ b/sign/signtoolshim.h @@ -0,0 +1,52 @@ +#ifndef SIGNTOOLSHIM_H_INCLUDED +#define SIGNTOOLSHIM_H_INCLUDED +// $Id: signtoolshim.h,v 1.4 2025/04/22 17:24:04 cvsuser Exp $ +// +// AutoUpdater: sign-tool +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if defined(__cplusplus) +extern "C" { +#endif + +struct SignToolArgs { + const char *progname; // sign-tool program name; default argv. + const char *progtitle; // program usage title line. + + const char *version; // application version; x.x.x.x + + const char *hosturl; // manifest URL. + const char *hosturlalt; // alternative manifest URL. +}; + +extern int SignToolShim(int argc, char *argv[], const struct SignToolArgs *args); + +#if defined(__cplusplus) +} +#endif + +#endif //SIGNTOOLSHIM_H_INCLUDED + +//end diff --git a/src/AutoConfig.cpp b/src/AutoConfig.cpp index b218b71..63c6b6a 100644 --- a/src/AutoConfig.cpp +++ b/src/AutoConfig.cpp @@ -1,4 +1,4 @@ -// $Id: AutoConfig.cpp,v 1.22 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoConfig.cpp,v 1.25 2025/04/22 05:30:36 cvsuser Exp $ // // AutoUpdater: configuration management. // @@ -36,6 +36,9 @@ #include "AutoError.h" #include "AutoString.h" +#include "../util/Base64.h" +#include "../util/Hex.h" + #if defined(PRAGMA_COMMENT_LIB) #pragma comment(lib, "version.lib") #endif @@ -57,6 +60,8 @@ std::string Config::company_name_; std::string Config::application_name_; std::string Config::application_version_; std::string Config::build_label_; +unsigned Config::public_keys_; +struct Config::Ed25519Key Config::ed25519_keys_[3]; namespace { @@ -204,7 +209,7 @@ Config::GetStringFileInfo() WORD lang = 0; if (! ::VerQueryValue((void *)GetVerInfoData(), TEXT("\\VarFileInfo\\Translation"), (LPVOID *)&translations, &count)) { - throw SysException("Executable does not have required VERSIONINFO\\VarFileInfo resource"); + throw SysException("Executable does not have the required VERSIONINFO\\VarFileInfo resource"); } count /= sizeof(struct TranslationInfo); @@ -256,7 +261,7 @@ Config::GetVerInfoField(const char *field, bool required) if (! ::VerQueryValueA((void *)GetVerInfoData(), (LPSTR)(key.c_str()), (void **)&value, &len)) { if (required) { - throw SysException("Executable does not have required key in StringFileInfo"); + throw SysException("Executable does not have the required key in StringFileInfo"); } value = ""; } @@ -291,7 +296,7 @@ Config::GetPrivateValue(const char *name, const char *type, bool required) } if (required) { - std::string message("Executable does not have required resource "); + std::string message("Executable does not have the required resource "); message += name, message += "\\", message += type; throw SysException(message); } @@ -391,6 +396,94 @@ Config::SetRegistryPath(const char *path) } +//public +void +Config::SetPublicKey(const char *base64, unsigned version) +{ + const std::string key = + Updater::Base64::decode_to_string(base64, strlen(base64)); + + if (key.length() != ED25519_PUBLIC_LENGTH) { + throw SysException("error decoding public-key"); + } + + SetEd25519Key(key.data(), key.length(), version); +} + + +void +Config::SetEd25519Key(const void *key, size_t length, unsigned version) +{ + if (0 == version) { + throw SysException("Ed25519: version incorrect"); + } + + if (length != ED25519_PUBLIC_LENGTH) { + throw SysException("Ed25519: key length incorrect"); + } + + CriticalSection::Guard lock(critical_section_); + + assert(sizeof(ed25519_keys_[0].public_key) == ED25519_PUBLIC_LENGTH); + for (unsigned k = 0; k < _countof(ed25519_keys_); ++k) { + if (ed25519_keys_[k].version == version || // update or new + ed25519_keys_[k].version == 0) { + + if (0 == ed25519_keys_[k].version) { + ++public_keys_; // active count + } + ed25519_keys_[k].version = version; + memcpy(ed25519_keys_[k].public_key, key, ED25519_PUBLIC_LENGTH); + + LOG() << "Config::SetEd25519Key=" << + version << ',' << Updater::Hex::to_string(ed25519_keys_[k].public_key, ED25519_PUBLIC_LENGTH) + << " [" << k << "]" << LOG_ENDL; + return; + } + } + + throw SysException("Ed25519: key table full"); +} + + +//private +size_t +Config::PublicKeyNumber() +{ + return public_keys_; +} + + +//private +void * +Config::PublicKeyFind(const std::string& keyversion, unsigned &type, size_t &length) +{ + unsigned version; + + if (2 == sscanf(keyversion.c_str(), "%u.%u", &type, &version)) { // . + if (type == 1) { // ed25519 + for (unsigned k = 0; k < _countof(ed25519_keys_); ++k) { + if (ed25519_keys_[k].version == version) { + length = ED25519_PUBLIC_LENGTH; + return ed25519_keys_[k].public_key; + } + } + } + } + length = 0; + return NULL; +} + + +bool +Config::PublicKeyFind(const std::string& keyversion) +{ + unsigned type = 0; + size_t length = 0; + return (NULL != Config::PublicKeyFind(keyversion, type, length)); +} + + //public int Config::GetConsoleMode() @@ -405,7 +498,7 @@ Config::GetFeedURL() { CriticalSection::Guard lock(critical_section_); if (host_URL_.empty()) { - if (0 == (queried_status_ & QUERY_HOSTURL)) { // non-optional resource + if (0 == (queried_status_ & QUERY_HOSTURL)) { // non-optional resource // // UPDATER // FeedURL Update manifest feed URL. @@ -555,6 +648,31 @@ Config::GetBuildLabel() } +//public. +const bool +Config::HasEdDSAPub() +{ + CriticalSection::Guard lock(critical_section_); + if (public_keys_ == 0) { + if (0 == (queried_status_ & QUERY_EDDSAPUB)) { + // + // UPDATER + // EdDSAPubKey Public-key, encoded as a base64. + // EdDSAKeyVer Key-version, positive numeric. + // + const std::string public_key = GetPrivateValue("UPDATER", "EdDSAPubKey", false); + if (! public_key.empty()) { + const std::string key_version = GetPrivateValue("UPDATER", "EdDSAKeyVer", true); + unsigned version = static_cast(strtoul(key_version.c_str(), NULL, 0)); + SetPublicKey(public_key.c_str(), version); + } + queried_status_ |= QUERY_EDDSAPUB; + } + } + return (public_keys_ != 0); +} + + //public const std::string& Config::GetRegistryPath() diff --git a/src/AutoConfig.h b/src/AutoConfig.h index 5b67b08..3d97c53 100644 --- a/src/AutoConfig.h +++ b/src/AutoConfig.h @@ -1,6 +1,6 @@ #ifndef AUTOCONFIG_H_INCLUDED #define AUTOCONFIG_H_INCLUDED -// $Id: AutoConfig.h,v 1.17 2025/02/21 19:03:23 cvsuser Exp $ +// $Id: AutoConfig.h,v 1.20 2025/04/22 17:25:25 cvsuser Exp $ // // AutoUpdater: configuration management. // @@ -36,17 +36,19 @@ #endif #include "AutoLogger.h" +#include "AutoEd25519.h" namespace Updater { class Config { enum { - QUERY_HOSTURL = (1 << 0), - QUERY_CHANNEL = (1 << 1), - QUERY_OSLABEL = (1 << 2), - QUERY_PRODUCTNAME = (1 << 3), - QUERY_PRODUCTVERSION = (1 << 4), - QUERY_COMPANYNAME = (1 << 5), - QUERY_BUILDLABEL = (1 << 6) + QUERY_HOSTURL = (1 << 0), + QUERY_CHANNEL = (1 << 1), + QUERY_OSLABEL = (1 << 2), + QUERY_PRODUCTNAME = (1 << 3), + QUERY_PRODUCTVERSION = (1 << 4), + QUERY_COMPANYNAME = (1 << 5), + QUERY_BUILDLABEL = (1 << 6), + QUERY_EDDSAPUB = (1 << 7) }; public: @@ -74,6 +76,9 @@ class Config { /// Retrieve build label. static const std::string& GetBuildLabel(); + /// Determine whether a edDSA public-key is available. + static const bool HasEdDSAPub(); + /// Retrieve registry path, derived from the application details static const std::string& GetRegistryPath(); @@ -104,6 +109,14 @@ class Config { /// Set Windows registry path to store settings in (relative to HKCU/KHLM). static void SetRegistryPath(const char *path); + // Set a Ed2551 public-key + static void SetPublicKey(const char *base64, unsigned version); + static void SetEd25519Key(const void *key, size_t length, unsigned version); + + static size_t PublicKeyNumber(); + static void * PublicKeyFind(const std::string &keyset, unsigned &type, size_t &length); + static bool PublicKeyFind(const std::string &keyset); + /* * Access to runtime configuration. */ @@ -188,6 +201,12 @@ class Config { void *data_; }; + // Ed25519 public key + struct Ed25519Key { + unsigned version; + uint8_t public_key[ED25519_PUBLIC_LENGTH]; + }; + private: static CriticalSection critical_section_; static int console_mode_; @@ -204,6 +223,8 @@ class Config { static std::string application_name_; static std::string application_version_; static std::string build_label_; + static unsigned Config::public_keys_; + static struct Ed25519Key ed25519_keys_[3]; // 3 versions }; } // namespace Updater diff --git a/src/AutoDownLoad.cpp b/src/AutoDownLoad.cpp index 839f3d3..c15753b 100644 --- a/src/AutoDownLoad.cpp +++ b/src/AutoDownLoad.cpp @@ -1,4 +1,4 @@ -// $Id: AutoDownLoad.cpp,v 1.23 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoDownLoad.cpp,v 1.26 2025/04/22 05:30:36 cvsuser Exp $ // // AutoUpdater: download/inet functionality. // @@ -521,7 +521,7 @@ DownloadContext::execute() session_handle = InternetOpenA(user_agent.c_str(), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); if (! session_handle) { - InternetError("Opening internet connection"); + InternetError("Opening Internet connection"); } DWORD http2_option = HTTP_PROTOCOL_FLAG_HTTP2; @@ -649,16 +649,17 @@ DownloadContext::execute() } // read content -#define BUFSIZE (16 * 1024) - char *buffer = static_cast(malloc(BUFSIZE)); - if (NULL == buffer) +#define IOBUFFER_SIZE (64 * 1024) + char *buffer = static_cast(malloc(IOBUFFER_SIZE)); + if (NULL == buffer) { throw AppException("Unable to allocate download buffer"); + } - (void) memset(buffer, 0, BUFSIZE); + (void) memset(buffer, 0, IOBUFFER_SIZE); if (sink.open()) { for (;;) { DWORD read = 0; - if (! InternetReadFile(request_handle, buffer, BUFSIZE, &read)) { + if (! InternetReadFile(request_handle, buffer, IOBUFFER_SIZE, &read)) { throw SysException("Reading Internet connection"); } @@ -851,4 +852,3 @@ DownloadContext::callback(HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInte } } // namespace Updater - diff --git a/src/AutoEd25519.cpp b/src/AutoEd25519.cpp new file mode 100644 index 0000000..8ea6340 --- /dev/null +++ b/src/AutoEd25519.cpp @@ -0,0 +1,230 @@ +// $Id: AutoEd25519.cpp,v 1.2 2025/04/21 13:58:28 cvsuser Exp $/ +// +// AutoUpdater: ed25519 support functions. +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include "common.h" + +#include "AutoEd25519.h" + +#include "../ed25519/src/ed25519.h" +#include "../util/Base64.h" + +#include +#include +#include +#include +#include +#include + +static const char PUBLIC_KEY[] = "ED25519 PUBLIC KEY"; +static const char PRIVATE_KEY[] = "ED25519 PRIVATE KEY"; + + +static int +write_pem(FILE *fp, const char *key, const void *src, size_t length) +{ + const uint8_t *cursor = static_cast(src); + char base64[70]; + + fprintf(fp, "-----BEGIN %s-----\n", key); + + while (length) { + const size_t line_length = (length > 48 ? 48 : length); + + Updater::Base64::encode(cursor, line_length, base64, sizeof(base64)); + fprintf(fp, "%s\n", base64); + + length -= line_length; + cursor += length; + } + + fprintf(fp, "-----END %s-----\n", key); + memset(base64, 0, sizeof(base64)); + + return !ferror(fp); +} + + +static bool +read_pem(FILE *fp, const char *key, uint8_t *dst, size_t dstlength) +{ + char line[1024]; + + while (dstlength && fgets(line, sizeof(line), fp)) { + // section makers + if (key) { // match opening key + if (0 != strncmp(line, "-----BEGIN ", 11) || + 0 != strncmp(line + 11, key, strlen(key))) { + continue; + } + key = NULL; + continue; + } + + if (0 == strncmp(line, "-----END ", 9)) { + break; // end + } + + // decode line + const size_t linelen = strcspn(line, "\r\n"); + const int length = + Updater::Base64::decode(line, linelen, dst, dstlength); + + if (-1 == length) { + errno = EINVAL; + return false; + } + + dstlength -= length; + dst += length; + } + + if (dstlength) { + if (key) { + errno = EINVAL; + } else { + errno = ENOENT; + } + return false; + } + return true; +} + + +static bool +public_key_write(FILE *strm, struct SignKeyPair *keypair) +{ + return write_pem(strm, PUBLIC_KEY, keypair->public_key, sizeof(keypair->public_key)); +} + + +static bool +private_key_write(FILE *strm, struct SignKeyPair *keypair) +{ + return write_pem(strm, PRIVATE_KEY, keypair->private_key, sizeof(*keypair)); +} + + +static bool +public_key_read(FILE *strm, struct SignKeyPair *keypair) +{ + return read_pem(strm, PUBLIC_KEY, keypair->public_key, sizeof(keypair->public_key)); +} + + +static bool +private_key_read(FILE *strm, struct SignKeyPair *keypair) +{ + return read_pem(strm, PRIVATE_KEY, keypair->private_key, sizeof(*keypair)); +} + + +///////////////////////////////////////////////////////////////////////////////////////// +// library interface +// + +extern "C" { + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +ed25519_generate_pem(const char *private_pem, const char *public_pem, const unsigned char *seed) +{ + struct SignKeyPair keypair; + FILE *strm; + + assert(sizeof(keypair) == (ED25519_PRIVATE_LENGTH + ED25519_PUBLIC_LENGTH)); + if (NULL == private_pem || NULL == public_pem) { + errno = EINVAL; + return -1; + } + + assert(sizeof(struct SignKeyPair) == (ED25519_PRIVATE_LENGTH + ED25519_PUBLIC_LENGTH)); + memset(&keypair, 0, sizeof(keypair)); + + if (seed == NULL) { // keep seed? ... 3rd party code may need + unsigned char t_seed[ED25519_SEED_LENGTH] = {0}; + + ed25519_create_seed(t_seed); + ed25519_create_keypair(keypair.public_key, keypair.private_key, t_seed); + memset(t_seed, 0, sizeof(t_seed)); + } else { + ed25519_create_keypair(keypair.public_key, keypair.private_key, seed); + } + + if (NULL == (strm = fopen(private_pem, "w+"))) { + return -1; + } + private_key_write(strm, &keypair); + fclose(strm); + + if (NULL == (strm = fopen(public_pem, "w+"))) { + return -1; + } + public_key_write(strm, &keypair); + fclose(strm); + + return 0; +} + + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +ed25519_load_pem(const char *private_pem, const char *public_pem, struct SignKeyPair *keypair) +{ + FILE *strm; + + if ((NULL == public_pem && NULL == private_pem) || NULL == keypair) { + errno = EINVAL; + return -1; + } + + assert(sizeof(struct SignKeyPair) == (ED25519_PRIVATE_LENGTH + ED25519_PUBLIC_LENGTH)); + memset(keypair, 0, sizeof(*keypair)); + + if (private_pem) { // private + private + if (NULL == (strm = fopen(private_pem, "r"))) { + return -1; + } + const bool ret = private_key_read(strm, keypair); + fclose(strm); + if (! ret) { + return -1; + } + + } else { // public-only + if (NULL == (strm = fopen(public_pem, "r"))) { + return -1; + } + const bool ret = public_key_read(strm, keypair); + fclose(strm); + if (!ret) { + return -1; + } + } + return 0; +} + +}; // extern "C" + +//end diff --git a/src/AutoEd25519.h b/src/AutoEd25519.h new file mode 100644 index 0000000..6246447 --- /dev/null +++ b/src/AutoEd25519.h @@ -0,0 +1,59 @@ +#ifndef AUTOED25519_H_INCLUDED +#define AUTOED25519_H_INCLUDED +// $Id: AutoEd25519.h,v 1.1 2025/04/21 13:59:08 cvsuser Exp $/ +// +// AutoUpdater: ed25519 support functions. +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include "AutoLinkage.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +#define ED25519_SEED_LENGTH 32 +#define ED25519_SIGNATURE_LENGTH 64 +#define ED25519_PRIVATE_LENGTH 64 +#define ED25519_PUBLIC_LENGTH 32 + +struct SignKeyPair { + unsigned char private_key[ED25519_PRIVATE_LENGTH]; + unsigned char public_key[ED25519_PUBLIC_LENGTH]; +// unsigned char version; +}; + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +ed25519_generate_pem(const char *private_pem, const char *public_pem, const unsigned char *seed); + +LIBAUTOUPDATER_LINKAGE int LIBAUTOUPDATER_ENTRY +ed25519_load_pem(const char *private_pem, const char *public_pem, struct SignKeyPair *keypair); + +#if defined(__cplusplus) +}; // extern "C" +#endif + +#endif //AUTOED25519_H_INCLUDED + +//end diff --git a/src/AutoError.cpp b/src/AutoError.cpp index 19ff58b..2788d5f 100644 --- a/src/AutoError.cpp +++ b/src/AutoError.cpp @@ -1,4 +1,4 @@ -// $Id: AutoError.cpp,v 1.14 2025/02/21 19:03:23 cvsuser Exp $ +// $Id: AutoError.cpp,v 1.15 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: exception interface. // @@ -28,6 +28,7 @@ #include "common.h" #include +#include #include "AutoError.h" @@ -48,12 +49,13 @@ SysErrorMessage(const char *message, DWORD err) msg = message, msg += ":\n\n"; } if (::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - 0, err, 0, (LPSTR)&buf, 0, NULL)) { - msg += buf; + 0, err, 0, (LPSTR)&buf, 0, NULL)) { + msg += buf; LocalFree(buf); } return msg; } + } // anonymous namespace diff --git a/src/AutoGitHub.cpp b/src/AutoGitHub.cpp index 0eaea13..88f6cdc 100644 --- a/src/AutoGitHub.cpp +++ b/src/AutoGitHub.cpp @@ -1,4 +1,4 @@ -// $Id: AutoGitHub.cpp,v 1.1 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoGitHub.cpp,v 1.2 2025/04/18 19:39:51 cvsuser Exp $ // // AutoUpdater: Update manifest. // diff --git a/src/AutoLinkage.h b/src/AutoLinkage.h new file mode 100644 index 0000000..83e9f9c --- /dev/null +++ b/src/AutoLinkage.h @@ -0,0 +1,52 @@ +#pragma once +/* $Id: AutoLinkage.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ + * + * libappupdatee public binding + * + * This file is part of libautoupdater (https://github.com/adamyg/libappupdater) + * + * Copyright (c) 2012 - 2025 Adam Young + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#if !defined(LIBAUTOUPDATER_LINKAGE) +#if defined(AUTOUPDATER_STATIC) +# define LIBAUTOUPDATER_LINKAGE +# define LIBAUTOUPDATER_ENTRY +#elif defined(WIN32) || defined(_WIN32) +# if defined(BUILDING_LIBAUTOUPDATER) +# define LIBAUTOUPDATER_LINKAGE __declspec(dllexport) +# if !defined(ED25519_BUILD_DLL) +# define ED25519_BUILD_DLL +# endif +# else +# define LIBAUTOUPDATER_LINKAGE __declspec(dllimport) +# if !defined(ED25519_DLL) +# define ED25519_DLL +# endif +# endif +# define LIBAUTOUPDATER_ENTRY __cdecl +#else +# define LIBAUTOUPDATER_LINKAGE +# define LIBAUTOUPDATER_ENTRY +#endif +#endif + +//end diff --git a/src/AutoLogger.h b/src/AutoLogger.h index 4f2795f..aaa9116 100644 --- a/src/AutoLogger.h +++ b/src/AutoLogger.h @@ -1,6 +1,6 @@ #ifndef AUTOLOGGER_H_INCLUDED #define AUTOLOGGER_H_INCLUDED -// $Id: AutoLogger.h,v 1.19 2025/04/16 11:59:28 cvsuser Exp $ +// $Id: AutoLogger.h,v 1.20 2025/04/18 19:39:51 cvsuser Exp $ // // AutoUpdater: logger. // diff --git a/src/AutoManifest.cpp b/src/AutoManifest.cpp index 6090cfd..abd7b19 100644 --- a/src/AutoManifest.cpp +++ b/src/AutoManifest.cpp @@ -1,4 +1,4 @@ -// $Id: AutoManifest.cpp,v 1.17 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoManifest.cpp,v 1.18 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: Update manifest. // @@ -71,7 +71,7 @@ namespace { // TODO: xxx // // -// ^ optional less than comparision. +// ^ optional less than comparison. // // xxx // @@ -88,7 +88,8 @@ namespace { // version= // shaSignature= // md5Signature= -// TODO: edSignature= +// edSignature= +// edKeyVersion= // /> // // : : @@ -126,6 +127,7 @@ namespace { #define ATTR_SHASIGNATURE "shaSignature" #define ATTR_MD5SIGNATURE "md5Signature" #define ATTR_EDSIGNATURE "edSignature" +#define ATTR_EDKEYVERSION "edKeyVersion" namespace { @@ -587,7 +589,9 @@ OnStartElement(void *data, const char *name, const char **attrs) } else if (0 == strcmp(var, ATTR_MD5SIGNATURE)) { manifest->attributeMD5Signature = value; } else if (0 == strcmp(var, ATTR_EDSIGNATURE)) { - manifest->attritbuteEDSignature = value; + manifest->attributeEDSignature = value; + } else if (0 == strcmp(var, ATTR_EDKEYVERSION)) { + manifest->attributeEDKeyVersion = value; } } } @@ -727,7 +731,7 @@ OnText(void *data, const char *s, int len) } else if (1 == ctx.link_level) { // manifest->link.append(s, len); - } else if (1 == ctx.description_level) {// + } else if (1 == ctx.description_level) { // manifest->description.append(s, len); } else if (1 == ctx.releaseNotesLink_level) { // @@ -761,9 +765,9 @@ OnText(void *data, const char *s, int len) char pubDate[32] = {0}; #if defined(__WATCOMC__) - _localtime(&published, &tm);// Sat, 20 Dec 2014 10:00:00 + _localtime(&published, &tm); // Sat, 20 Dec 2014 10:00:00 #else - _localtime64_s(&tm, &published);// Sat, 20 Dec 2014 10:00:00 + _localtime64_s(&tm, &published); // Sat, 20 Dec 2014 10:00:00 #endif strftime(pubDate, sizeof(pubDate), "%a %d %b %Y" /*" %H:%M:%S"*/, &tm); manifest->pubDate = pubDate; @@ -839,4 +843,3 @@ AutoManifest::IsCriticalUpdate(const std::string &app_version) const } } // namespace Updater - diff --git a/src/AutoManifest.h b/src/AutoManifest.h index dac10a4..6bd5f4e 100644 --- a/src/AutoManifest.h +++ b/src/AutoManifest.h @@ -1,6 +1,6 @@ #ifndef AUTOMANIFEST_H_INCLUDED #define AUTOMANIFEST_H_INCLUDED -// $Id: AutoManifest.h,v 1.13 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoManifest.h,v 1.14 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: application manifest. // @@ -61,7 +61,8 @@ class AutoManifest { std::string attributeType; // Image type. std::string attributeSHASignature; // SHA signature. std::string attributeMD5Signature; // MD5 signature. - std::string attritbuteEDSignature; // ED signature (TODO). + std::string attributeEDSignature; // EdSignature. + std::string attributeEDKeyVersion; // EdKeyVersion. mutable unsigned weight; diff --git a/src/AutoRelease.h b/src/AutoRelease.h index 5f8fea7..783b558 100644 --- a/src/AutoRelease.h +++ b/src/AutoRelease.h @@ -24,8 +24,8 @@ // SOFTWARE. // -#define AUTORELEASE_VERSION 1,0,0,1 -#define AUTORELEASE_FILEVERSION "1.0.0.1" +#define AUTORELEASE_VERSION 1,0,3,0 +#define AUTORELEASE_FILEVERSION "1.0.3.0" #if defined(_MSC_VER) #if (_MSC_VER >= 1930) /* (Visual Studio 2022 / MSVC++ 17.x) */ diff --git a/src/AutoUpdater.cpp b/src/AutoUpdater.cpp index a545ea5..434d463 100644 --- a/src/AutoUpdater.cpp +++ b/src/AutoUpdater.cpp @@ -1,4 +1,4 @@ -// $Id: AutoUpdater.cpp,v 1.31 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoUpdater.cpp,v 1.34 2025/04/22 05:30:36 cvsuser Exp $ // // AutoUpdater: Application interface. // @@ -80,6 +80,11 @@ #include "AutoDownload.h" #include "AutoGitHub.h" +#include "../ed25519/src/ed25519.h" +#include "../util/Format.h" +#include "../util/Base64.h" +#include "../util/Hex.h" + #include #include // UnidCreate() #if defined(PRAGMA_COMMENT_LIB) @@ -299,6 +304,13 @@ AutoUpdater::HostURL(const char *hosturl) } +void +AutoUpdater::PublicKey(const char *base64, unsigned version) +{ + if (base64) Config::SetPublicKey(base64, version); +} + + const char * AutoUpdater::HostURL() const { @@ -447,7 +459,7 @@ AutoUpdater::Status(const enum ExecuteMode mode) (void) Config::ReadConfigValue(KEY_AUTOINTERVAL, autointerval); const time_t expires = // default, 2-days - ((autointerval > 0 && autointerval <= 60 ? autointerval : 2) * 60 * 60 * 24); + ((time_t)((autointerval > 0 && autointerval <= 60 ? autointerval : 2)) * 60 * 60 * 24); time_t autolast = 0; if (Config::ReadConfigValue(KEY_AUTOLAST, autolast) && autolast) { @@ -547,7 +559,7 @@ AutoUpdater::Dump() // // Determine whether an update is available ... -// 1=yes,0=no,-1=cancelled/error +// 1=yes,0=no,-1=canceled/error // int AutoUpdater::IsAvailable(bool interactive) @@ -557,21 +569,25 @@ AutoUpdater::IsAvailable(bool interactive) // Retrieve and load manifest, plus optional description const std::string app_version = Config::GetAppVersion(); const std::string feed_url = Config::GetFeedURL(); + if (feed_url.empty()) { throw AppException("Host URL not configured."); } + Config::HasEdDSAPub(); // prime public_key details + LOG() << "Manifest source <" << feed_url << ">" << LOG_ENDL; if (interactive) { ProgressStart(NULL, true, "Checking for updates"); } int ret = -1; + try { // guard progress dialog. Updater::AutoManifest &d_manifest = d_impl->d_manifest; - std::string manifest_url = feed_url; Updater::GitHub github; StringDownloadSink manifest; + std::string manifest_url; Download inet; // GitHub redirection @@ -580,19 +596,21 @@ AutoUpdater::IsAvailable(bool interactive) if (! github.GetLatestRelease(feed_url, inet, DownloadFlags(), result)) { d_impl->SetLastError(result); - return -1; - } - if (result.empty()) { + } else if (result.empty()) { d_impl->SetLastError("GitHub manifest not available"); - return -1; + + } else { + manifest_url = result; } - manifest_url = result; + } else { + manifest_url = feed_url; } // Retrieve manifest - if (inet.get(manifest_url, manifest, DownloadFlags())) { + if (! manifest_url.empty() && + inet.get(manifest_url, manifest, DownloadFlags())) { if (! inet.completion()) { // manifest available. d_impl->SetLastError("Unable to download manifest"); @@ -603,29 +621,49 @@ AutoUpdater::IsAvailable(bool interactive) ret = -2; // channel not available. } else if (! ProgressCancelled()) { + // + // Signature required + // + bool suitable = true; + + if (Config::PublicKeyNumber()) { + if (d_manifest.attributeEDSignature.empty()) { + d_impl->SetLastError("Manifest missing edSignature, contact maintainer."); + suitable = false; + + } else if (! Config::PublicKeyFind(d_manifest.attributeEDKeyVersion)) { + d_impl->SetLastError(Updater::format("Manifest: unknown edKeyVersion <%s>, contact maintainer.", + d_manifest.attributeEDKeyVersion.c_str())); + suitable = false; + } + } + // // Check if our version is out of date. // - LOG() << "current version=" << app_version - << ", manifest=" << d_manifest.attributeVersion << LOG_ENDL; - - if (AutoVersion::Compare(app_version, d_manifest.attributeVersion) >= 0) { - LOG() << "same or newer version" << LOG_ENDL; - ret = 0; // same or newer version is already installed. - - } else { // load description, if available. - LOG() << "update available" << LOG_ENDL; - ret = 1; - - if (! d_manifest.releaseNotesLink.empty()) { - StringDownloadSink content(&d_manifest.releaseNotesContent); - if (! inet.get(d_manifest.releaseNotesLink, content) || - ! inet.completion()) { - d_impl->SetLastError("Unable to download release notes"); - ret = -1; + if (suitable) { + LOG() << "current version=" << app_version + << ", manifest=" << d_manifest.attributeVersion << LOG_ENDL; + + if (AutoVersion::Compare(app_version, d_manifest.attributeVersion) >= 0) { + LOG() << "same or newer version" << LOG_ENDL; + ret = 0; // same or newer version is already installed. + + } else { // load description, if available. + LOG() << "update available" << LOG_ENDL; + ret = 1; + + if (! d_manifest.releaseNotesLink.empty()) { + StringDownloadSink content(&d_manifest.releaseNotesContent); + + if (! inet.get(d_manifest.releaseNotesLink, content) || + ! inet.completion()) { + d_impl->SetLastError("Unable to download release notes"); + ret = -1; + } } } - } + } } } @@ -667,8 +705,8 @@ AutoUpdater::IsSkipped() (void) Config::ReadConfigValue(KEY_SKIPINTERVAL, skipinterval); const time_t expires = // default, 14 days - ((skipinterval > 0 && skipinterval <= 180 ? skipinterval : 14) - * (60 * 60 * 24) /*day*/); + ((time_t)((skipinterval > 0 && skipinterval <= 180 ? skipinterval : 14)) + * (60 * 60 * 24) /*day*/); if (skipinterval >= 0) { const time_t expiretime = skiptime + expires, @@ -735,6 +773,7 @@ AutoUpdater::InstallNow(IInstallNow &updater, bool interactive) bool verified = false; if (getfile && !wasCancelled) { // verify image. + Config::HasEdDSAPub(); if (interactive) { updater("Verifying installer image ..."); ProgressStart(updater.GetParent(), true, "Verifying installer ..."); @@ -799,7 +838,7 @@ AutoUpdater::InstallNow(IInstallNow &updater, bool interactive) } else if (! getfile) { if (wasCancelled) { if (interactive) { - updater("Install cancelled."); + updater("Install canceled."); } } else { @@ -813,7 +852,7 @@ AutoUpdater::InstallNow(IInstallNow &updater, bool interactive) } else { if (wasCancelled) { if (interactive) { - updater("Install cancelled."); + updater("Install canceled."); } } } @@ -901,19 +940,49 @@ bool AutoUpdater::Verify(const std::string &filename) { const Updater::AutoManifest &d_manifest = d_impl->d_manifest; - BYTE ioBuffer[8 * 1024]; // io buffer + uint8_t ed25519_signature[ED25519_SIGNATURE_LENGTH] = {0}; + const void *ed25519_public_key = NULL; HCRYPTPROV hProv = 0; HCRYPTHASH hHash = 0; - BOOL ioResult = FALSE; - DWORD ioSize = 0; DWORD fileSize; HANDLE hFile; LOG() << "Verify: target image <" << filename << ">" << LOG_ENDL; + // Signature + if (Config::PublicKeyNumber()) { + unsigned key_type = 0; + size_t key_length = 0; + + ed25519_public_key = + Config::PublicKeyFind(d_manifest.attributeEDKeyVersion, key_type, key_length); + if (ed25519_public_key == NULL || key_type != 0x01 /*ed25519*/) { + throw AppException(Updater::format("Verify: unknown key-version <%s>", + d_manifest.attributeEDKeyVersion.c_str())); + } + + if (key_length != ED25519_PUBLIC_LENGTH) { + throw AppException(Updater::format("Verify: invalid public key length, key-version <%s>", + d_manifest.attributeEDKeyVersion.c_str())); + } + + const std::string &edSignature = d_manifest.attributeEDSignature; + if (edSignature.empty()) { + throw AppException(Updater::format("Verify: edSignature missing for key-version <%s>", + d_manifest.attributeEDKeyVersion.c_str())); + } + + const size_t signature_length = + Updater::Base64::decode(edSignature.c_str(), edSignature.size(), ed25519_signature, sizeof(ed25519_signature)); + if (signature_length != ED25519_SIGNATURE_LENGTH) { + throw AppException(Updater::format("Verify: invalid signature length, key-version <%s>", + d_manifest.attributeEDKeyVersion.c_str())); + } + } + // Open source if (INVALID_HANDLE_VALUE == (hFile = CreateFileA(filename.c_str(), - GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL))) { + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL))) { throw SysException("Unable to open temporary file."); } @@ -932,12 +1001,12 @@ AutoUpdater::Verify(const std::string &filename) return false; } - // Get handle to the crypto provider + // Crypt provider handle const int hashType = (d_manifest.attributeSHASignature.length() ? CALG_SHA : CALG_MD5); - if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) || - !CryptCreateHash(hProv, hashType, 0, 0, &hHash)) { + if (! CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) || + ! CryptCreateHash(hProv, hashType, 0, 0, &hHash)) { DWORD dwStatus = GetLastError(); if (hProv) CryptReleaseContext(hProv, 0); CloseHandle(hFile); @@ -945,44 +1014,85 @@ AutoUpdater::Verify(const std::string &filename) } // Calculate hash - while ((ioResult = ::ReadFile(hFile, ioBuffer, sizeof(ioBuffer), &ioSize, NULL)) != FALSE) { - if (0 == ioSize) { - break; // EOF + int ed22519_verification = 1; // ed22519 verify result. + std::string hash; // MD5/SHA derived hash. + + { +#define IOBUFFER_SIZE (64 * 1024) + void *ed22519_context = NULL; + const char *dwMessage = NULL; + DWORD dwStatus = 0; + BYTE *ioBuffer; + + if (NULL == (ioBuffer = static_cast(malloc(IOBUFFER_SIZE)))) { + throw SysException(ERROR_NOT_ENOUGH_MEMORY, "Memory allocation."); } - if (! CryptHashData(hHash, ioBuffer, ioSize, 0)) { - DWORD dwStatus = GetLastError(); - CryptReleaseContext(hProv, 0); - CryptDestroyHash(hHash); - CloseHandle(hFile); - throw SysException(dwStatus, "CryptHashData failed."); + + if (ed25519_public_key != NULL) { // ed22519 signature + ed22519_context = ed25519_verify_init(ed25519_signature, static_cast(ed25519_public_key)); + ed22519_verification = -1; } - } - CloseHandle(hFile); - if (! ioResult) { - DWORD dwStatus = GetLastError(); - CryptReleaseContext(hProv, 0); + + while (1) { + DWORD ioSize = 0; + + if (! ::ReadFile(hFile, ioBuffer, IOBUFFER_SIZE, &ioSize, NULL)) { + dwMessage = "Unable to read working file."; + dwStatus = GetLastError(); + break; + } + + if (ioSize == 0) { + break; + } + + if (! CryptHashData(hHash, ioBuffer, ioSize, 0)) { + dwMessage = "CryptHashData failed."; + dwStatus = GetLastError(); + break; + } + + ed25519_verify_update(ed22519_context, ioBuffer, ioSize); + } + + CloseHandle(hFile); + free(ioBuffer); + + if (NULL == dwMessage) { + BYTE hashBuffer[20] = {0}; // 16=MD5,20=SHA + DWORD hashSize = sizeof(hashBuffer); + + if (CryptGetHashParam(hHash, HP_HASHVAL, hashBuffer, &hashSize, 0)) { + hash = Updater::Hex::to_string(hashBuffer, hashSize); + } + } + CryptDestroyHash(hHash); - throw SysException(dwStatus, "Unable to read temporary file."); - } + CryptReleaseContext(hProv, 0); - const char hashDigits[] = "0123456789abcdef"; - BYTE hashBuffer[20] = {0}; // 16=MD5,20=SHA - DWORD hashSize = sizeof(hashBuffer); - std::string hash; + if (ed22519_context) { // ed22519 signature + ed22519_verification = ed25519_verify_final(ed22519_context); + ed22519_context = NULL; + } - if (CryptGetHashParam(hHash, HP_HASHVAL, hashBuffer, &hashSize, 0)) { - for (DWORD i = 0; i < hashSize; ++i) { - hash += hashDigits[hashBuffer[i] >> 4]; - hash += hashDigits[hashBuffer[i] & 0xf]; + if (dwMessage) { + throw SysException(dwStatus, dwMessage); } } + // Hash/sign comparisons LOG() << "Verify: target-hash=<" << hash << ">" << LOG_ENDL; - CryptDestroyHash(hHash); - CryptReleaseContext(hProv, 0); if ((hashType == CALG_SHA && hash == d_manifest.attributeSHASignature) || (hashType == CALG_MD5 && hash == d_manifest.attributeMD5Signature)) { + + if (ed25519_public_key) { + if (ed22519_verification != 1) { + LOG() << "ed25519-verify failed" << LOG_ENDL; + return false; + } + LOG() << "Verify: target-signature=" << LOG_ENDL; + } return true; } diff --git a/src/AutoUpdater.h b/src/AutoUpdater.h index 620444f..1f0f0c6 100644 --- a/src/AutoUpdater.h +++ b/src/AutoUpdater.h @@ -1,6 +1,6 @@ #ifndef AUTOUPDATER_H_INCLUDED #define AUTOUPDATER_H_INCLUDED -// $Id: AutoUpdater.h,v 1.20 2025/02/21 19:03:23 cvsuser Exp $ +// $Id: AutoUpdater.h,v 1.21 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: application interface. // @@ -35,22 +35,7 @@ #include "IAutoUpdaterUI.h" #include "AutoManifest.h" -#if !defined(LIBAUTOUPDATER_LINKAGE) -#if defined(AUTOUPDATER_STATIC) -# define LIBAUTOUPDATER_LINKAGE -# define LIBAUTOUPDATER_ENTRY -#elif defined(WIN32) || defined(_WIN32) -# if defined(BUILDING_LIBAUTOUPDATER) -# define LIBAUTOUPDATER_LINKAGE __declspec(dllexport) -# else -# define LIBAUTOUPDATER_LINKAGE __declspec(dllimport) -# endif -# define LIBAUTOUPDATER_ENTRY __cdecl -#else -# define LIBAUTOUPDATER_LINKAGE -# define LIBAUTOUPDATER_ENTRY -#endif -#endif +#include "AutoLinkage.h" class IAutoUpdaterUI; class CUpdateInstallDlg; // dialog implementation @@ -86,8 +71,9 @@ class LIBAUTOUPDATER_LINKAGE AutoUpdater { const char * AppVersion() const; void HostURL(const char *hosturl); const char * HostURL() const; + void PublicKey(const char *key, unsigned version); - // Execute autoupdater + // Update execution mode enum ExecuteMode { ExecuteDump = -2, // Dump the updater status. ExecuteReset = -1, // Reset updater status. diff --git a/src/AutoUpdater.rc b/src/AutoUpdater.rc index db097c2..8026062 100644 --- a/src/AutoUpdater.rc +++ b/src/AutoUpdater.rc @@ -3,7 +3,7 @@ // // This file is part of libautoupdater (https://github.com/adamyg/libappupdater) // -// Copyright (c) 2012 - 2023, Adam Young +// Copyright (c) 2012 - 2025, Adam Young // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -56,8 +56,8 @@ CAPTION "About AutoUpdater" FONT 9, "Microsoft Sans Serif", 400, 0, 0x0 BEGIN CONTROL IDB_BITMAP2,IDC_STATIC,"Static",SS_BITMAP,6,6,24,24 - LTEXT "AutoUpdater Version 1.0.1",IDC_STATIC,50,15,104,8,SS_NOPREFIX - LTEXT "Copyright (C) 2012-2023",IDC_STATIC,50,27,104,8 + LTEXT "AutoUpdater Version 1.0.3",IDC_STATIC,50,15,104,8,SS_NOPREFIX + LTEXT "Copyright (C) 2012-2025",IDC_STATIC,50,27,104,8 DEFPUSHBUTTON "OK",IDOK,160,7,50,16,WS_GROUP END @@ -125,7 +125,7 @@ BEGIN VALUE "FileVersion", AUTORELEASE_FILEVERSION #endif VALUE "InternalName", "libautoupdater.dll" - VALUE "LegalCopyright", "(c) 2012-2023 Adam Young, All rights reserved." + VALUE "LegalCopyright", "(c) 2012-2024 Adam Young, All rights reserved." "This is free software; see the source for copying conditions. " "There is NO warranty; not even for MERCHANTABILITY " "or FITNESS FOR A PARTICULAR PURPOSE. " diff --git a/src/AutoVersion.h b/src/AutoVersion.h index e31c51a..d47b4b9 100644 --- a/src/AutoVersion.h +++ b/src/AutoVersion.h @@ -1,6 +1,6 @@ #ifndef AUTOVERSION_H_INCLUDED #define AUTOVERSION_H_INCLUDED -// $Id: AutoVersion.h,v 1.13 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: AutoVersion.h,v 1.14 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: Version comparison. // @@ -32,7 +32,7 @@ namespace Updater { -// Dedian stype version comparsion, examples: +// Dedian style version comparison, examples: // // o 2.10 comes after 2.9 // o 2.11-beta comes after 2.11-alpha @@ -149,6 +149,7 @@ namespace Updater { // strings of letters which the package management system cannot interpret (such // as ALPHA or pre-), or with silly orderings. // + class AutoVersion { public: AutoVersion(): epoch_(0), upstream_(), revision_() diff --git a/src/CProgressDialog.cpp b/src/CProgressDialog.cpp index 776608f..8fe46d4 100644 --- a/src/CProgressDialog.cpp +++ b/src/CProgressDialog.cpp @@ -1,4 +1,4 @@ -// $Id: CProgressDialog.cpp,v 1.19 2025/02/21 19:03:23 cvsuser Exp $ +// $Id: CProgressDialog.cpp,v 1.20 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: Progress dialog. // @@ -399,7 +399,7 @@ dialog_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_DLG_UPDATE: { - CriticalSection::Guard(self->Lock()); + CriticalSection::Guard guard(self->Lock()); self->Update(); } return TRUE; @@ -416,7 +416,7 @@ dialog_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_CLOSE: case WM_COMMAND: if (msg == WM_CLOSE || wParam == IDCANCEL) { - CriticalSection::Guard(self->Lock()); + CriticalSection::Guard guard(self->Lock()); self->Cancelled(); SetMarquee(hWnd, 0); diff --git a/src/ProgressStyle.h b/src/ProgressStyle.h index 6c7a32e..20ad627 100644 --- a/src/ProgressStyle.h +++ b/src/ProgressStyle.h @@ -1,11 +1,11 @@ #pragma once -// $Id: ProgressStyle.h,v 1.2 2023/10/17 12:47:53 cvsuser Exp $ +// $Id: ProgressStyle.h,v 1.3 2025/04/21 13:58:28 cvsuser Exp $ // // ProgressStyle // // This file is part of libappupdater (https://github.com/adamyg/libappupdater) // -// Copyright (c) 2023, Adam Young +// Copyright (c) 2023 - 2025, Adam Young // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/common.h b/src/common.h index b96210c..e2d1669 100644 --- a/src/common.h +++ b/src/common.h @@ -1,4 +1,4 @@ -// $Id: common.h,v 1.18 2025/04/16 11:33:48 cvsuser Exp $ +// $Id: common.h,v 1.19 2025/04/21 13:58:28 cvsuser Exp $ // // AutoUpdater: Common definitions. // @@ -147,3 +147,4 @@ autosnprintf_s( char * s, size_t n, const char * format, ... ) #define _countof(array) (sizeof(array) / sizeof(array[0])) #endif +//end \ No newline at end of file diff --git a/test/upgetopt.cpp b/test/upgetopt.cpp deleted file mode 100644 index a2eb91c..0000000 --- a/test/upgetopt.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// $Id: upgetopt.cpp,v 1.2 2021/08/12 14:48:38 cvsuser Exp $ -// -// getopt() implementation -// - -#include -#include -#include - -#include "upgetopt.h" - -namespace Updater { - -int optind = 1, /* index into parent argv vector */ - optopt; /* character checked for validity */ -const char *optarg; /* argument associated with option */ - -int -Getopt(int nargc, char **nargv, const char *ostr) -{ -#define OPTBADCH (int)'?' -#define OPTEMSG "" -#define OPTERR(s) \ - fputs(*nargv,stderr);fputs(s,stderr); \ - fputc(optopt,stderr);fputc('\n',stderr); \ - return(OPTBADCH); - - static const char *place = OPTEMSG; /* option letter processing */ - const char *oli; /* option letter list index */ - - if (!*place) { /* update scanning pointer */ - if (optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) { - return(EOF); - } - - if (*place == '-') { /* found "--" */ - ++optind; - return EOF; - } - } - /* option letter okay? */ - if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr,optopt))) { - if (!*place) ++optind; - OPTERR(": illegal option -- "); - } - - if (*++oli != ':') { /* don't need argument */ - optarg = NULL; - if (!*place) ++optind; - - } else { /* need an argument */ - if (*place) optarg = place; /* no white space */ - else if (nargc <= ++optind) { /* no arg */ - place = OPTEMSG; - OPTERR(": option requires an argument -- "); - - } else optarg = nargv[optind]; /* white space */ - place = OPTEMSG; - ++optind; - } - -#undef OPTBADCH -#undef OPTEMSG -#undef OPTERR - - return(optopt); /* dump back option letter */ -} - -} // namespace Updater diff --git a/update/updatetool.cpp b/update/updatetool.cpp new file mode 100644 index 0000000..99d781d --- /dev/null +++ b/update/updatetool.cpp @@ -0,0 +1,59 @@ +// $Id: updatetool.cpp,v 1.4 2025/04/22 17:23:55 cvsuser Exp $ +// +// AutoUpdater: update-tool - example +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2012 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include "updatetoolshim.h" + +// Function: Main +// Application entry. +// +// Returns: +// 0 - No check performed. +// 1 - Up-to-date. +// 2 - Installed. +// 3 - Update available. +// 99 - Usage +// + +int +main(int argc, char *argv[]) +{ + struct UpdateToolArgs args = {0}; + + args.progname = "updatetool"; + + args.appname = "libautoupdate"; +// ags.version = "0.0.0.0"; + +// args.hosturl = hosturl1; +// args.hosturlalt = hosturl2; +// args.privatekey = private_key_base64; +// args.keyversion = key_version; + + return UpdateToolShim(argc, argv, &args); +} + +//end diff --git a/update/updatetool.rc b/update/updatetool.rc new file mode 100644 index 0000000..6212a19 --- /dev/null +++ b/update/updatetool.rc @@ -0,0 +1,128 @@ +/* + * AutoUpdater: update-tool, example resource file + * + * This file is part of libappupdater (https://github.com/adamyg/libappupdater) + * + * Copyright (c) 2012 - 2025, Adam Young + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef WINDRES +#include "windows.h" +#include "winver.h" +#endif + +#define RC_PRODUCTVERSION 1 , 0 , 3 , 0 +#define RC_FILEVERSION 1 , 0 , 3 , 0 + +/* + * English (U.S.) resources + */ + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) + +#ifdef _WIN32 +#ifndef WINDRES +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#endif +#pragma code_page(1252) +#endif /* _WIN32 */ + +/* + * Manifest + */ +#ifndef RT_MANIFEST +#define RT_MANIFEST 24 +#endif +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#endif +//#ifdef _WIN64 +//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "../manifest_x64.xml" +//#else +//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "../manifest.xml" +//#endif + +/* + * Updater Meta Data + * nameID typeID { raw data } + */ + +UPDATER HostURL { "\0" } +UPDATER Channel { "release\0" } +UPDATER EdDSAPubKey { "\0" } +UPDATER EdDSAKeyVer { "\0" } + +/* + * Version Information + */ + +VS_VERSION_INFO VERSIONINFO +#if defined(RC_FILEVERSION) + FILEVERSION RC_FILEVERSION + PRODUCTVERSION RC_PRODUCTVERSION +#endif + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS (VS_FF_SPECIALBUILD|VS_FF_DEBUG) +#else + FILEFLAGS (VS_FF_SPECIALBUILD) +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "" + VALUE "FileDescription", "AutoUpdater" + VALUE "FileVersion", "1.0.3", + VALUE "InternalName", "updatetool example" + VALUE "Copyright", + "Copyright (C) 2012-2025, Adam Young. All rights reserved. \n" + "Ed25519, Copyright (c) 2015 Orson Peters . \n" + "Copyright (c) 2009-2017 Dave Gamble and cJSON contributors. \n" + "Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper. \n" + "Copyright (c) 2001-2019 Expat maintainers. \n" + "This is free software; see the source for copying conditions. \n" + "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n" + VALUE "Maintainers", "https://github.com/adamyg/libappupdater" + VALUE "LegalTrademarks", "see READMD.md" + VALUE "OriginalFilename", "updatetool.exe" + VALUE "ProductName", "libappupdater" + END + END + + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END + END + +#endif /* English (U.S.) resources */ diff --git a/update/updatetoolshim.cpp b/update/updatetoolshim.cpp new file mode 100644 index 0000000..db05e63 --- /dev/null +++ b/update/updatetoolshim.cpp @@ -0,0 +1,230 @@ +// $Id: updatetoolshim.cpp,v 1.5 2025/04/22 17:23:55 cvsuser Exp $ +// +// Midnight Commander AutoUpdater command line. +// + +#if !defined(_CRT_SECURE_NO_WARNINGS) +#define _CRT_SECURE_NO_WARNINGS +#endif + +#include +#include +#include + +#define WINDOWS_LEAN_AND_MEAN +#include + +#include "updatetoolshim.h" + +#include "../libautoupdater.h" + +#include "../util/upgetopt.h" +#include "../util/util.h" + +static void Usage(const struct UpdateToolArgs& args); + +static const char *progname; + +// Function: UpdateToolShim +// UpdateTool application shim. +// +// Returns: +// 0 - No check performed. +// 1 - Up-to-date. +// 2 - Installed. +// 3 - Update available. +// 99 - Usage +// +int +UpdateToolShim(int argc, char* argv[], const struct UpdateToolArgs *args) +{ + const char *options = (args->hosturlalt ? "V:H:AK:x:L:icvh" : "V:H:K:x:L:icvh"); + const char *version = args->version, + *hosturl = args->hosturl, + *public_key = args->publickey; + unsigned key_version = args->keyversion; + int mode = 2, interactive = 0; + int ch; + + // arguments + progname = (args->progname ? args->progname : Updater::Util::Basename(argv[0])); + while (-1 != (ch = Updater::Getopt(argc, argv, options))) { + switch (ch) { + case 'V': // application version + version = Updater::optarg; + break; + case 'H': // host URL + hosturl = Updater::optarg; + break; + case 'A': // alternative source + hosturl = args->hosturlalt; + break; + + case 'K': // private key + public_key = Updater::optarg; + break; + case 'x': // key version; default 1 + key_version = static_cast(strtoul(Updater::optarg, NULL, 0)); + break; + + case 'L': // log-path + autoupdate_logger_path(Updater::optarg); + break; + case 'i': // interactive + ++interactive; + break; + case 'c': // console + autoupdate_set_console_mode(1); + break; + case 'v': // verbose + autoupdate_logger_stdout(1); + break; + + case 'h': + default: + Usage(*args); + break; + } + } + + argv += Updater::optind; + if ((argc -= Updater::optind) < 1) { + std::cerr << "\n" << + progname << ": expected arguments " << std::endl; + Usage(*args); + } else if (argc > 1) { + std::cerr << "\n" << + progname << ": unexpected arguments '" << argv[1] << "' ..." << std::endl; + Usage(*args); + } + + if (!version || !*version) { + std::cerr << "\n" << + progname << ": -V expected." << std::endl; + Usage(*args); + } + + if (!hosturl || !*hosturl) { + std::cerr << "\n" << + progname << ": -H expected." << std::endl; + Usage(*args); + } + + if (public_key && 0 == key_version) { + std::cerr << "\n" << + progname << ": -x required, public key without version." << std::endl; + Usage(*args); + } + + const char *arg = argv[0]; + +#if defined(__MINGW32__) +#define STRICMP(__a,__b) strcasecmp(__a,__b) +#else +#define STRICMP(__a,__b) _stricmp(__a,__b) +#endif + + if (0 == STRICMP("disable", arg)) { + mode = 0; + } else if (0 == STRICMP("enable", arg)) { + mode = 1; + } else if (0 == STRICMP("auto", arg)) { + mode = 2; + } else if (0 == STRICMP("prompt", arg)) { + mode = 3; + } else if (0 == STRICMP("force", arg)) { + mode = 4; + } else if (0 == STRICMP("reinstall", arg)) { + mode = 5; + } else if (0 == STRICMP("reset", arg)) { + mode = -1; + } else if (0 == STRICMP("dump", arg)) { + mode = -2; + } else if (0 == STRICMP("config", arg)) { + if (args->progtitle) + std::cout + << args->progtitle << "\n"; + std::cout + << "Built: " << __DATE__ << "\n" + << "Version: " << version << "\n" + << "Host: " << hosturl << "\n"; + if (public_key) + std::cout + << "Key: ed25519\n"; + return 0; + } else { + std::cerr << "\n" << + progname << ": unknown mode '" << arg << "'" << std::endl; + Usage(*args); + } + + if (mode >= 1) { + autoupdate_appversion_set(version); + autoupdate_hosturl_set(hosturl); + if (public_key) { + autoupdate_ed25519_key(public_key, key_version); // public key + } + autoupdate_appname_set(args->appname ? args->appname : progname); + // note: name should align with installer + } + + return autoupdate_execute(mode, interactive); +} + + +// Function: Usage +// Command line usage and exit. +// +static void +Usage(const struct UpdateToolArgs& args) +{ + const char *progtitle = + (args.progtitle && *args.progtitle ? args.progtitle : "AutoUpdater application check"); + + std::cout.flush(); + std::cerr << + "\n"\ + << progtitle << ".\n"\ + "Version (" << autoupdate_version_string() << ")\n"\ + "\n"\ + " " << progname << " [options] mode\n"\ + "\n"\ + "Modes:\n"\ + " auto - Periodically check for updates.\n"\ + " prompt - Re-prompt user when periodic updates are disabled.\n"\ + " force - Prompt ignoring skip status.\n"\ + " reinstall - Prompt unconditionally, even if up-to-date/skipped.\n"\ + "\n"\ + " enable - Enable periodic checks.\n"\ + " disable - Disable automatic periodic checks.\n"\ + " reset - Reset the updater status.\n"\ + "\n"\ + " config - Configuration.\n"\ + "\n"\ + "Options:\n"\ + " -V Version label, form .\n"; + + std::cerr << + " -H Explicit source URL"\ + ", default <" << (args.hosturl ? args.hosturl : "none") << ">.\n"; + + if (NULL != args.hosturlalt) + std::cerr << + " -A alternative source URL <" << args.hosturlalt << ">.\n"; + + if (NULL == args.publickey || 0 == args.keyversion) + std::cerr << + " -K Private key image, generates a Ed25519 signature.\n"\ + " -x KeyVersion, default <1>.\n"\ + "\n"; + + std::cerr << + " -L Diagnostics log path.\n"\ + " -i Interactive ('auto' only).\n"\ + " -c Console mode.\n"\ + " -v Verbose diagnostics.\n"\ + "\n" << std::endl; + std::exit(99); +} + +/*end*/ diff --git a/update/updatetoolshim.h b/update/updatetoolshim.h new file mode 100644 index 0000000..4bf2281 --- /dev/null +++ b/update/updatetoolshim.h @@ -0,0 +1,56 @@ +#ifndef UPDATETOOLSHIM_H_INCLUDED +#define UPDATETOOLSHIM_H_INCLUDED +// $Id: updatetoolshim.h,v 1.4 2025/04/22 17:23:55 cvsuser Exp $ +// +// AutoUpdater: update-tool +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if defined(__cplusplus) +extern "C" { +#endif + +struct UpdateToolArgs { + const char *progname; // update-tool program name; default argv. + const char *progtitle; // program usage title line. + + const char *appname; // application name; registry key. + const char *version; // application version; x.x.x.x + + const char *hosturl; // manifest URL. + const char *hosturlalt; // alternative manifest URL. + + const char *publickey; // Ed2559 public key. + unsigned keyversion; // key version +}; + +extern int UpdateToolShim(int argc, char *argv[], const struct UpdateToolArgs *args); + +#if defined(__cplusplus) +} +#endif + +#endif //UPDATETOOLSHIM_H_INCLUDED + +//end diff --git a/util/Base64.h b/util/Base64.h new file mode 100644 index 0000000..4ff04f4 --- /dev/null +++ b/util/Base64.h @@ -0,0 +1,185 @@ +#ifndef BASE64_H_INCLUDED +#define BASE64_H_INCLUDED +// $Id: Base64.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ +// +// AutoUpdater: base64 utils +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include +#include +#include + +#include + +namespace Updater { + +class Base64 { +public: + static size_t + encode_dstlength(size_t length) + { + return (length * 4 / 3 + 4) + 1; /* 3-byte blocks to 4-byte */ + } + + static int + encode(const void* src, size_t length, char* dst, size_t dstlength) + { + const char *encodetable = b64encodetable(); + const uint8_t *in = (uint8_t*)src, * end = in + length; + const size_t osize = Base64::encode_dstlength(length); + int count = 0; + + assert(dstlength >= osize); + if (dstlength < osize) { + return -1; + } + + while ((end - in) >= 3) { + uint32_t triple = (in[0] << 0x10) + (in[1] << 0x08) + in[2]; + + in += 3; + count += 4; + + *dst++ = encodetable[(triple >> 3 * 6) & 0x3f]; + *dst++ = encodetable[(triple >> 2 * 6) & 0x3f]; + *dst++ = encodetable[(triple >> 1 * 6) & 0x3f]; + *dst++ = encodetable[(triple >> 0 * 6) & 0x3f]; + } + + const size_t remainder = end - in; + if (remainder) { + *dst++ = encodetable[in[0] >> 2]; + if (remainder == 1) { + *dst++ = encodetable[(in[0] & 0x03) << 4]; + *dst++ = '='; + } else { + *dst++ = encodetable[((in[0] & 0x03) << 4) | (in[1] >> 4)]; + *dst++ = encodetable[(in[1] & 0x0f) << 2]; + } + *dst++ = '='; + count += 4; + } + + *dst = 0; + return (count + 1); + } + + static std::string + encode_to_string(const void *src, size_t length) + { + std::string result; + result.resize(encode_dstlength(length)); + encode(src, length, const_cast(result.data()), result.size()); + return result; + } + + static size_t + decode_dstlength(const void *src, size_t length) + { + size_t dstlength = length / 4 * 3; + + const uint8_t *end = static_cast(src) + length; + if (end[-1] == '=') --dstlength; + if (end[-2] == '=') --dstlength; + return dstlength; + } + + static int + decode(const void *src, size_t length, uint8_t *dst, size_t dstlength) + { + static const uint8_t *decodetable = b64decodetable(); + + if (NULL == decodetable || (length % 4 != 0)) { + return -1; + } + + if (length < 4) { + return 0; + } + + size_t needed = decode_dstlength(src, length); + if (dstlength < needed) { + return -1; + } + + const uint8_t *in = static_cast(src); + for (uint8_t *eod = dst + needed; dst != eod;) { + + const uint32_t a = decodetable[*in++]; + const uint32_t b = decodetable[*in++]; + const uint32_t c = (*in == '=' ? 0 : decodetable[*in++]); + const uint32_t d = (*in == '=' ? 0 : decodetable[*in++]); + + const uint32_t triple = + (a << 3 * 6) + (b << 2 * 6) + + (c << 1 * 6) + (d << 0 * 6); + + if (dst != eod) *dst++ = (triple >> 2 * 8) & 0xff; + if (dst != eod) *dst++ = (triple >> 1 * 8) & 0xff; + if (dst != eod) *dst++ = (triple >> 0 * 8) & 0xff; + } + + return (int)needed; + } + + static std::string + decode_to_string(const void *src, size_t length) + { + std::string result; + if (length >= 4) { + result.resize(decode_dstlength(src, length)); + decode(src, length, (uint8_t *)(result.data()), result.size()); + } + return result; + } + +private: + static const char * + b64encodetable() + { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + } + + static const uint8_t * + b64decodetable() + { + const char *encodetable = b64encodetable(); + uint8_t *decodetable; + + decodetable = static_cast(calloc(1, 256)); + if (NULL != decodetable) { + for (uint8_t n = 0; n < 64; ++n) { + decodetable[(uint8_t)encodetable[n]] = n; + } + } + return decodetable; + } +}; + +} // namespace Updater + +#endif //BASE64_H_INCLUDED + +//end \ No newline at end of file diff --git a/test/CUpdater.cpp b/util/CUpdater.cpp similarity index 88% rename from test/CUpdater.cpp rename to util/CUpdater.cpp index 336b384..7f48aaf 100644 --- a/test/CUpdater.cpp +++ b/util/CUpdater.cpp @@ -1,4 +1,4 @@ -// $Id: CUpdater.cpp,v 1.13 2025/02/21 19:03:24 cvsuser Exp $ +// $Id: CUpdater.cpp,v 1.16 2025/04/22 06:19:43 cvsuser Exp $ // // AutoUpdater -- dialog test application. // @@ -57,15 +57,19 @@ CUpdaterApp::Run() AutoUpdater au; au.EnableDialog(); - au.AppName("AutoUpdate Test Framework"); - au.AppVersion("0.0.1"); + au.AppName("Application Test Framework"); + au.AppVersion("1.0.3"); - //au.HostURL("file:///./example/grief.manifest"); + //au.HostURL("file:///../example/grief.manifest"); //au.HostURL("https://sourceforge.net/projects/grief/files/grief.manifest/download"); //au.HostURL("https://master.dl.sourceforge.net/project/grief/grief.manifest?viasf=1"); + au.HostURL("https://api.github.com/repos/adamyg/mcwin32~mcwin32.manifest"); + au.PublicKey("h6H7R5mHUYkfgs4+P46ZzoG8ItzII0ViwiZEsml1XFE=", 1); au.Execute(AutoUpdater::ExecuteReinstall, true); return TRUE; } + +//end diff --git a/test/CUpdater.h b/util/CUpdater.h similarity index 100% rename from test/CUpdater.h rename to util/CUpdater.h diff --git a/test/CUpdater.rc b/util/CUpdater.rc similarity index 100% rename from test/CUpdater.rc rename to util/CUpdater.rc diff --git a/util/CryptDES.h b/util/CryptDES.h new file mode 100644 index 0000000..c85c742 --- /dev/null +++ b/util/CryptDES.h @@ -0,0 +1,283 @@ +#ifndef CRYPTDES_H_INCLUDED +#define CRYPTDES_H_INCLUDED +// $Id: CryptDES.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ +// +// AutoUpdater: DES crypt interface +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#if !defined(WINDOWS_MEAN_AND_LEAN) +#define WINDOWS_MEAN_AND_LEAN +#include +#endif +#include +#include + +#pragma comment(lib, "BCrypt.lib") + +namespace Updater { + +class DES { +public: + struct DESKey { + BYTE rgbIV[16]; + BYTE rgbAES128Key[16]; + }; + +#ifndef BCRYPT_SUCCESS +#define BCRYPT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) +#endif + + static const BYTE * + Encrypt(const struct DESKey *key, const BYTE *text, DWORD text_length, DWORD *result) + { + BCRYPT_ALG_HANDLE hAesAlg = NULL; + BCRYPT_KEY_HANDLE hKey = NULL; + NTSTATUS status = (NTSTATUS)-1L; + DWORD cbCipherText = 0, + cbData = 0, + cbKeyObject = 0, + cbBlockLen = 0; + PBYTE pbCipherText = NULL, + pbKeyObject = NULL, + pbIV = NULL; + + // Open an algorithm handle. + if (!BCRYPT_SUCCESS(status = + BCryptOpenAlgorithmProvider(&hAesAlg, BCRYPT_AES_ALGORITHM,NULL, 0))) { + printf("**** Error 0x%x returned by BCryptOpenAlgorithmProvider\n", status); + goto cleanup; + } + + // Calculate the size of the buffer to hold the KeyObject. + if (!BCRYPT_SUCCESS(status = + BCryptGetProperty(hAesAlg, BCRYPT_OBJECT_LENGTH, (PBYTE)&cbKeyObject, sizeof(DWORD), &cbData, 0))) { + printf("**** Error 0x%x returned by BCryptGetProperty\n", status); + goto cleanup; + } + + // Allocate the key object on the heap. + pbKeyObject = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbKeyObject); + if (NULL == pbKeyObject) { + printf("**** Memory allocation failed\n"); + goto cleanup; + } + + // Calculate the block length for the IV. + if (!BCRYPT_SUCCESS(status = + BCryptGetProperty(hAesAlg, BCRYPT_BLOCK_LENGTH, (PBYTE)&cbBlockLen, sizeof(DWORD), &cbData, 0))) { + printf("**** Error 0x%x returned by BCryptGetProperty\n", status); + goto cleanup; + } + + // Determine whether the cbBlockLen is not longer than the IV length. + if (cbBlockLen > sizeof(key->rgbIV)) { + printf("**** block length is longer than the provided IV length\n"); + goto cleanup; + } + + // Allocate a buffer for the IV. The buffer is consumed during the encrypt/decrypt process. + pbIV = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbBlockLen); + if (NULL == pbIV) { + printf("**** memory allocation failed\n"); + goto cleanup; + } + memcpy(pbIV, key->rgbIV, cbBlockLen); + + if (!BCRYPT_SUCCESS(status = + BCryptSetProperty(hAesAlg, BCRYPT_CHAINING_MODE, (PBYTE)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0))) { + printf("**** Error 0x%x returned by BCryptSetProperty\n", status); + goto cleanup; + } + + // Generate the key from supplied input key bytes. + if (!BCRYPT_SUCCESS(status = + BCryptGenerateSymmetricKey(hAesAlg, &hKey, pbKeyObject, cbKeyObject, (PBYTE)key->rgbAES128Key, sizeof(key->rgbAES128Key), 0))) { + printf("**** Error 0x%x returned by BCryptGenerateSymmetricKey\n", status); + goto cleanup; + } + + // Get the output buffer size. + if (!BCRYPT_SUCCESS(status = + BCryptEncrypt(hKey, (PBYTE)text, text_length, NULL, pbIV, cbBlockLen, NULL, 0, &cbCipherText, BCRYPT_BLOCK_PADDING))) { + printf("**** Error 0x%x returned by BCryptEncrypt\n", status); + goto cleanup; + } + + pbCipherText = (PBYTE) HeapAlloc(GetProcessHeap(), 0, cbCipherText); + if (NULL == pbCipherText) { + printf("**** Memory allocation failed\n"); + goto cleanup; + } + + // Encrypt the plain-text buffer. + if (!BCRYPT_SUCCESS(status = + BCryptEncrypt(hKey, (PBYTE)text, text_length, NULL, pbIV, cbBlockLen, pbCipherText,cbCipherText, &cbData, BCRYPT_BLOCK_PADDING))) { + printf("**** Error 0x%x returned by BCryptEncrypt\n", status); + HeapFree(GetProcessHeap(), 0, pbCipherText); + pbCipherText = NULL; + goto cleanup; + } + + cleanup: + if (hAesAlg) { + BCryptCloseAlgorithmProvider(hAesAlg, 0); + } + + if (hKey) { + BCryptDestroyKey(hKey); + } + + if (pbKeyObject) { + HeapFree(GetProcessHeap(), 0, pbKeyObject); + } + + if (pbIV) { + HeapFree(GetProcessHeap(), 0, pbIV); + } + + if (pbCipherText) { + *result = cbCipherText; + } + + return pbCipherText; + } + + static const BYTE * + Decrypt(const struct DESKey *key, const BYTE *cipher, DWORD cipher_length, DWORD *result) + { + BCRYPT_ALG_HANDLE hAesAlg = NULL; + BCRYPT_KEY_HANDLE hKey = NULL; + NTSTATUS status = (NTSTATUS)-1L; + DWORD cbPlainText = 0, + cbData = 0, + cbKeyObject = 0, + cbBlockLen = 0; + PBYTE pbPlainText = NULL, + pbKeyObject = NULL, + pbIV = NULL; + + // Open an algorithm handle. + if (!BCRYPT_SUCCESS(status = + BCryptOpenAlgorithmProvider(&hAesAlg, BCRYPT_AES_ALGORITHM, NULL, 0))) { + printf("**** Error 0x%x returned by BCryptOpenAlgorithmProvider\n", status); + goto cleanup; + } + + // Calculate the size of the buffer to hold the KeyObject. + if (!BCRYPT_SUCCESS(status = + BCryptGetProperty(hAesAlg, BCRYPT_OBJECT_LENGTH, (PBYTE)&cbKeyObject, sizeof(DWORD), &cbData, 0))) { + printf("**** Error 0x%x returned by BCryptGetProperty\n", status); + goto cleanup; + } + + // Allocate the key object on the heap. + pbKeyObject = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbKeyObject); + if (NULL == pbKeyObject) { + printf("**** Memory allocation failed\n"); + goto cleanup; + } + + // Calculate the block length for the IV. + if (!BCRYPT_SUCCESS(status = + BCryptGetProperty(hAesAlg, BCRYPT_BLOCK_LENGTH, (PBYTE)&cbBlockLen, sizeof(DWORD), &cbData, 0))) { + printf("**** Error 0x%x returned by BCryptGetProperty\n", status); + goto cleanup; + } + + // Determine whether the cbBlockLen is not longer than the IV length. + if (cbBlockLen > sizeof(key->rgbIV)) { + printf("**** Block length is longer than the provided IV length\n"); + goto cleanup; + } + + // Allocate a buffer for the IV. The buffer is consumed during the encrypt/decrypt process. + pbIV = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbBlockLen); + if (NULL == pbIV) { + printf("**** Memory allocation failed\n"); + goto cleanup; + } + memcpy(pbIV, key->rgbIV, cbBlockLen); + + if (!BCRYPT_SUCCESS(status = + BCryptSetProperty(hAesAlg, BCRYPT_CHAINING_MODE, (PBYTE)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0))) { + printf("**** Error 0x%x returned by BCryptSetProperty\n", status); + goto cleanup; + } + + // Generate the key from supplied input key bytes. + if (!BCRYPT_SUCCESS(status = + BCryptGenerateSymmetricKey(hAesAlg, &hKey, pbKeyObject, cbKeyObject, (PBYTE)key->rgbAES128Key, sizeof(key->rgbAES128Key), 0))) { + printf("**** Error 0x%x returned by BCryptGenerateSymmetricKey\n", status); + goto cleanup; + } + + // Get the output buffer size. + if (!BCRYPT_SUCCESS(status = + BCryptDecrypt(hKey, (PBYTE)cipher, cipher_length, NULL, pbIV, cbBlockLen, NULL, 0, &cbPlainText, BCRYPT_BLOCK_PADDING))) { + printf("**** Error 0x%x returned by BCryptDecrypt\n", status); + goto cleanup; + } + + pbPlainText = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbPlainText); + if (NULL == pbPlainText) { + printf("**** memory allocation failed\n"); + goto cleanup; + } + + // Decrypt the cipher-text buffer. + if (!BCRYPT_SUCCESS(status = + BCryptDecrypt(hKey, (PBYTE)cipher, cipher_length, NULL, pbIV, cbBlockLen, pbPlainText, cbPlainText, &cbPlainText, BCRYPT_BLOCK_PADDING))) { + printf("**** Error 0x%x returned by BCryptDecrypt\n", status); + goto cleanup; + } + + cleanup: + if (hAesAlg) { + BCryptCloseAlgorithmProvider(hAesAlg, 0); + } + + if (hKey) { + BCryptDestroyKey(hKey); + } + + if (pbKeyObject) { + HeapFree(GetProcessHeap(), 0, pbKeyObject); + } + + if (pbIV) { + HeapFree(GetProcessHeap(), 0, pbIV); + } + + if (pbPlainText) { + *result = cbPlainText; + } + + return pbPlainText; + } +}; + +} // namespace Updater + +#endif //CRYPTDES_H_INCLUDED diff --git a/util/Format.h b/util/Format.h new file mode 100644 index 0000000..cb5b17e --- /dev/null +++ b/util/Format.h @@ -0,0 +1,92 @@ +#ifndef FORMAT_H_INCLUDED +#define FORMAT_H_INCLUDED +// $Id: Format.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ +// +// AutoUpdater: format utils +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include +#include +#include + +#include + +namespace Updater { + +#ifndef VA_COPY +# if defined(HAVE_VA_COPY) || defined(va_copy) /* ISO C99 and later */ +#define VA_COPY(__dst, __src) va_copy(__dst, __src) +# elif defined(HAVE___VA_COPY) || defined(__va_copy) /* gnu */ +#define VA_COPY(__dst, __src) __va_copy(__dst, __src) +# elif defined(__WATCOMC__) /* Older Watcom implementations */ +#define VA_COPY(__dst, __src) memcpy((__dst), (__src), sizeof (va_list)) +# else +#define VA_COPY(__dst, __src) (__dst) = (__src) +# endif +#define VA_COPY_LOCAL 1 +#endif /*VA_COPY*/ + +inline std::string +formatv(const char *message, va_list ap) +{ + std::string msg; + + if (!message || !*message) { + return msg; + } + + va_list tap; + + VA_COPY(tap, ap); + const size_t osize = vsnprintf(NULL, 0, message, tap); + msg.resize(osize); + + const size_t size = vsprintf(const_cast(msg.data()), message, ap); + assert(size == osize); + va_end(tap); + + return msg; +} + + +inline std::string +format(const char *message, ...) +{ + va_list ap; + va_start(ap, message); + return formatv(message, ap); +} + +#ifdef VA_COPY_LOCAL +#undef VA_COPY_LOCAL +#undef VA_COPY +#endif + +} // namespace Updater + +#endif //FORMAT_H_INCLUDED + +//end + diff --git a/util/Hex.h b/util/Hex.h new file mode 100644 index 0000000..b8f3b6a --- /dev/null +++ b/util/Hex.h @@ -0,0 +1,63 @@ +#ifndef HEX_H_INCLUDED +#define HEX_H_INCLUDED +// $Id: Hex.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ +// +// AutoUpdater: hex utils +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include +#include +#include + +#include + +namespace Updater { + +class Hex { +public: + static std::string + to_string(const void *src, size_t length) + { + const char digits[] = "0123456789abcdef"; + std::string result; + + result.resize(length * 2); + + const uint8_t *bin = static_cast(src); + char *cursor = const_cast(result.data()); + + for (size_t i = 0; i < length; i++) { + *cursor++ += digits[bin[i] >> 4]; + *cursor++ += digits[bin[i] & 0xf]; + } + return result; + } +}; + +} // namespace Updater + +#endif //HEX_H_INCLUDED + +//end diff --git a/test/TLibappupdater.cpp b/util/TLibappupdater.cpp similarity index 100% rename from test/TLibappupdater.cpp rename to util/TLibappupdater.cpp diff --git a/test/TUpdater.cpp b/util/TUpdater.cpp similarity index 74% rename from test/TUpdater.cpp rename to util/TUpdater.cpp index 2123e62..6040720 100644 --- a/test/TUpdater.cpp +++ b/util/TUpdater.cpp @@ -1,6 +1,6 @@ -// $Id: TUpdater.cpp,v 1.6 2025/02/21 19:03:24 cvsuser Exp $ +// $Id: TUpdater.cpp,v 1.9 2025/04/22 06:19:43 cvsuser Exp $ // -// AutoUpdater -- console test application. +// AutoUpdater -- console test/example application. // // This file is part of libautoupdater (https://github.com/adamyg/libappupdater) // @@ -29,13 +29,14 @@ #include #include "../libautoupdater.h" +#include "util.h" #include "upgetopt.h" static void Usage(); -static const char * Basename(const char *name); - -static const char * x_progname; +static const char * progname; +static const char * hosturldefault = + "https://api.github.com/repos/adamyg/mcwin32~mcwin32.manifest"; // Function: Main // Application entry. @@ -50,13 +51,14 @@ static const char * x_progname; int main(int argc, char *argv[]) { - const char *version = "1.0.2", - *hosturl = "https://sourceforge.net/projects/grief/files/grief.manifest/download"; + const char *version = "1.0.3", *hosturl = hosturldefault; + const char *public_pem = NULL; + unsigned key_version = 1; int mode = 2, interactive = 0; int ch; - x_progname = Basename(argv[0]); - while (-1 != (ch = Updater::Getopt(argc, argv, "V:H:iL:vh"))) { + progname = Updater::Util::Basename(argv[0]); + while (-1 != (ch = Updater::Getopt(argc, argv, "V:H:K:x:iL:vh"))) { switch (ch) { case 'V': /* application version */ version = Updater::optarg; @@ -64,10 +66,16 @@ main(int argc, char *argv[]) case 'H': /* host URL */ hosturl = Updater::optarg; break; + case 'K': /* Public key */ + public_pem = Updater::optarg; + break; + case 'x': /* key version; default 1 */ + key_version = static_cast(strtoul(Updater::optarg, NULL, 0)); + break; case 'i': /* interactive */ ++interactive; break; - case 'L': /* logpath */ + case 'L': /* log path */ autoupdate_logger_path(Updater::optarg); break; case 'v': /* verbose */ @@ -83,11 +91,11 @@ main(int argc, char *argv[]) argv += Updater::optind; if ((argc -= Updater::optind) < 1) { std::cerr << "\n" << - x_progname << ": expected arguments " << std::endl; + progname << ": expected arguments " << std::endl; Usage(); } else if (argc > 1) { std::cerr << "\n" << - x_progname << ": unexpected arguments '" << argv[1] << "' ..." << std::endl; + progname << ": unexpected arguments '" << argv[1] << "' ..." << std::endl; Usage(); } @@ -118,16 +126,19 @@ main(int argc, char *argv[]) return 0; } else { std::cerr << "\n" << - x_progname << ": unknown mode '" << arg << "'" << std::endl; + progname << ": unknown mode '" << arg << "'" << std::endl; Usage(); } + autoupdate_set_console_mode(1); if (mode >= 1) { + if (public_pem) { + autoupdate_ed25519_pem(public_pem, key_version); + } autoupdate_appversion_set(version); autoupdate_hosturl_set(hosturl); } - autoupdate_set_console_mode(1); return autoupdate_execute(mode, interactive); } @@ -146,7 +157,8 @@ Usage() { std::cerr << "\n"\ - "Console updater version 1.02\n"\ + "Console updater\n"\ + "Version (" << autoupdate_version_string() << ")\n" \ "\n"\ " consoleupdater [options] mode\n"\ "\n"\ @@ -154,7 +166,7 @@ Usage() " auto - Periodically check for updates.\n"\ " prompt - Re-prompt user when periodic updates are disabled.\n"\ " force - Unconditionally prompt, even when skipped.\n"\ - " reinstall - Prompt for install, even if uptodate.\n"\ + " reinstall - Prompt for install, even if up-to-date.\n"\ " enable - Enable periodic checks.\n"\ " disable - Disable automatic periodic checks.\n"\ " reset - Reset the updater status.\n"\ @@ -163,23 +175,12 @@ Usage() "\n"\ "Options:\n"\ " -V Version label.\n"\ - " -H Host URL.\n"\ + " -H Host URL, default <" << hosturldefault << ">.\n"\ + " -K Public key.\n"\ " -i Interactive ('auto' only).\n"\ - " -v Verbose diagnostice.\n"\ + " -v Verbose diagnostics.\n"\ "\n" << std::endl; exit(99); } - -// Function: Basename -// Retrieve the file basename from the specified file path. -// -static const char * -Basename(const char *filename) -{ - const char *name; - return (NULL != (name = strrchr(filename, '/'))) - || (NULL != (name = strrchr(filename, '\\'))) ? name + 1 : filename; -} - /*end*/ diff --git a/util/Util.h b/util/Util.h new file mode 100644 index 0000000..876ac53 --- /dev/null +++ b/util/Util.h @@ -0,0 +1,50 @@ +#ifndef UTIL_H_INCLUDED +#define UTIL_H_INCLUDED +// $Id: Util.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $ +// +// AutoUpdater: utils +// +// This file is part of libappupdater (https://github.com/adamyg/libappupdater) +// +// Copyright (c) 2024 - 2025, Adam Young +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +#include +#include + +namespace Updater { + +class Util { +public: + static const char * + Basename(const char *filename) + { + const char *name; + return (NULL != (name = strrchr(filename, '/'))) + || (NULL != (name = strrchr(filename, '\\'))) ? name + 1 : filename; + } +}; + +} // namespace Updater + +#endif //UTIL_H_INCLUDED + +//end \ No newline at end of file diff --git a/util/cryptdes_test.cpp b/util/cryptdes_test.cpp new file mode 100644 index 0000000..8e41685 --- /dev/null +++ b/util/cryptdes_test.cpp @@ -0,0 +1,49 @@ +//////////////////////////////////////////////////////////////////////////////// +// DES test application + +#include "CryptDES.h" + +static void +PrintBytes(const BYTE *pbPrintData, const DWORD cbDataLen) +{ + DWORD dwCount = 0; + for (dwCount = 0; dwCount < cbDataLen; dwCount++) { + printf("0x%02x, ", pbPrintData[dwCount]); + if (0 == (dwCount + 1) % 10) putchar('\n'); + } +} + + +int +main(int argc, char *argv[]) +{ + const BYTE text[] = { + "1. The quick brown fox jumps over the lazy dog. "\ + "2. The quick brown fox jumps over the lazy dog. "\ + "3. The quick brown fox jumps over the lazy dog. "\ + "4. The quick brown fox jumps over the lazy dog. " + }; + struct Updater::DES::DESKey key = { + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } + }; + + DWORD encrypted_length = 0; + const BYTE *encrypted = Updater::DES::Encrypt(&key, text, sizeof(text), &encrypted_length); + + printf("plain_text=%u\n%s\n", sizeof(text), text); + printf("encrypted_length=%u\n", (unsigned)encrypted_length); + PrintBytes(encrypted, encrypted_length); + printf("\n"); + + DWORD decrypted_length = 0; + const BYTE *decrypted = Updater::DES::Decrypt(&key, encrypted, encrypted_length, &decrypted_length); + + printf("decrypted_length=%u\n", (unsigned)decrypted_length); + PrintBytes(decrypted, decrypted_length); + printf("\n"); + printf("plain_text=%u\n%s\n", sizeof(decrypted), decrypted); + return 0; +} + +//end diff --git a/util/keygen.cpp b/util/keygen.cpp new file mode 100644 index 0000000..1885e0c --- /dev/null +++ b/util/keygen.cpp @@ -0,0 +1,94 @@ +// $Id: keygen.cpp,v 1.3 2025/04/21 13:58:28 cvsuser Exp $ +// +// KeyGen - Ed255519 key generator +// + +#include +#include +#include + +#include "../libautoupdater.h" +#include "Base64.h" +#include "Hex.h" +#include "upgetopt.h" + +static const char *progname = "keygen"; + +static void Usage(); + +int +main(int argc, char* argv[]) +{ + const char *private_pem = "private.pem", *public_pem = "public.pem"; + int ch; + + progname = argv[0]; + while (-1 != (ch = Updater::Getopt(argc, argv, "K:k:h"))) { + switch (ch) { + case 'K': // private + private_pem = Updater::optarg; + break; + case 'k': // public + public_pem = Updater::optarg; + break; + case 'h': + default: + Usage(); + break; + } + } + + argv += Updater::optind; + argc -= Updater::optind; + if (argc > 0) { + std::cerr << "\n" << + progname << ": unexpected arguments '" << argv[0] << "' ..." << std::endl; + Usage(); + } + + struct SignKeyPair keypair; + + if (0 == _access(private_pem, 0)) { + std::cout << "Loading <" << private_pem << ">\n"; + if (-1 == ed25519_load_pem(private_pem, NULL, &keypair)) { + return EXIT_FAILURE; + } + + } else { + std::cout << "Generating <" << private_pem << "> and <" << public_pem << ">\n"; + if (-1 == ed25519_generate_pem(private_pem, public_pem, NULL) || + -1 == ed25519_load_pem(private_pem, public_pem, &keypair)) { + return EXIT_FAILURE; + } + } + + std::cout << + "A key-pair has been generated and saved locally.\n" + "Add the following public-key into your updater application.\n" + "\n" << + " \"" << Updater::Base64::encode_to_string(keypair.public_key, sizeof(keypair.public_key)) << "\"\n" + "\n"; + +#if !defined(NDEBUG) + // See: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/ + std::cout << + "Private:" << Updater::Hex::to_string(keypair.private_key, sizeof(keypair.private_key)) << "\n" + " Public:" << Updater::Hex::to_string(keypair.public_key, sizeof(keypair.public_key)) << "\n"; +#endif + + memset(&keypair, 0, sizeof(keypair)); + return EXIT_SUCCESS; +} + + +static void +Usage() +{ + std::cerr << + "\n"\ + "keygen -K -k "\ + "\n" << std::endl; + exit(99); +} + +//end \ No newline at end of file diff --git a/test/resource.h b/util/resource.h similarity index 100% rename from test/resource.h rename to util/resource.h diff --git a/test/stdafx.h b/util/stdafx.h similarity index 100% rename from test/stdafx.h rename to util/stdafx.h diff --git a/test/updateyear.pl b/util/updateyear.pl similarity index 100% rename from test/updateyear.pl rename to util/updateyear.pl diff --git a/util/upgetopt.cpp b/util/upgetopt.cpp new file mode 100644 index 0000000..1c98002 --- /dev/null +++ b/util/upgetopt.cpp @@ -0,0 +1,137 @@ +// $Id: upgetopt.cpp,v 1.4 2025/04/21 13:58:28 cvsuser Exp $ +// +// getopt() implementation +// + +#include +#include +#include + +#include "upgetopt.h" + +#if defined(__WATCOMC__) +#pragma disable_message(391) /* assignment found in boolean expression */ +#endif + +namespace Updater { + +int optind = 1, /* index into parent argv vector */ + optopt; /* character checked for validity */ +const char *optarg; /* argument associated with option */ +const wchar_t *woptarg; /* argument associated with option */ + + +#define OPTBADCH (int)'?' + +int +Getopt(int nargc, char **nargv, const char *ostr) +{ +#define OPTEMSG "" +#define OPTERR(__s) \ + fputs(*nargv, stderr); fputs(__s, stderr); fputc(optopt, stderr); fputc('\n', stderr); \ + return(OPTBADCH); + + static const char *place = OPTEMSG; /* option letter processing */ + const char *oli; /* option letter list index */ + + if (!*place) { /* update scanning pointer */ + if (optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) { + return(EOF); + } + + if (*place == '-') { /* found "--" */ + ++optind; + return EOF; + } + } + /* option letter okay? */ + if ((optopt = (int)*place++) == (int)':' || + NULL == (oli = strchr(ostr,optopt))) { + if (!*place) ++optind; + OPTERR(": illegal option -- "); + } + + if (*++oli != ':') { /* don't need argument */ + optarg = NULL; + if (!*place) ++optind; + + } else { /* need an argument */ + if (*place) { + optarg = place; /* no white space */ + + } else if (nargc <= ++optind) { /* no arg */ + place = OPTEMSG; + OPTERR(": option requires an argument -- "); + + } else { + optarg = nargv[optind]; /* white space */ + } + + place = OPTEMSG; + ++optind; + } + +#undef OPTEMSG +#undef OPTERR + + return(optopt); /* dump back option letter */ +} + + +int +Getopt(int nargc, wchar_t **nargv, const char *ostr) +{ +#define LOPTEMSG L"" +#define LOPTERR(__s) \ + fputws(*nargv, stderr); fputws(__s, stderr); fputwc(optopt, stderr); fputwc('\n', stderr); \ + return (OPTBADCH); + + static const wchar_t *place = LOPTEMSG; /* option letter processing */ + const char *oli; /* option letter list index */ + + if (!*place) { /* update scanning pointer */ + if (optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) { + return(EOF); + } + + if (*place == '-') { /* found "--" */ + ++optind; + return EOF; + } + } + /* option letter okay? */ + if ((optopt = (int)*place++) == (int)':' || + NULL == (oli = strchr(ostr,optopt))) { + if (!*place) ++optind; + LOPTERR(L": illegal option -- "); + } + + if (*++oli != ':') { /* don't need argument */ + woptarg = NULL; + if (!*place) ++optind; + + } else { /* need an argument */ + if (*place) { + woptarg = place; /* no white space */ + + } else if (nargc <= ++optind) { /* no arg */ + place = LOPTEMSG; + LOPTERR(L": option requires an argument -- "); + + } else { + woptarg = nargv[optind]; /* white space */ + } + + place = LOPTEMSG; + ++optind; + } + +#undef LOPTEMSG +#undef LOPTERR + + return(optopt); /* dump back option letter */ +} + +} // namespace Updater + +//end \ No newline at end of file diff --git a/test/upgetopt.h b/util/upgetopt.h similarity index 66% rename from test/upgetopt.h rename to util/upgetopt.h index 23bfa21..6ade5be 100644 --- a/test/upgetopt.h +++ b/util/upgetopt.h @@ -1,17 +1,23 @@ +#pragma once #ifndef UPGETOPT_H_INCLUDED #define UPGETOPT_H_INCLUDED -// $Id: upgetopt.h,v 1.2 2015/01/05 23:44:26 ayoung Exp $ +// $Id: upgetopt.h,v 1.4 2025/04/21 13:58:28 cvsuser Exp $ // // getopt() implementation // +#include + namespace Updater { extern int optind, /* index into parent argv vector */ optopt; /* character checked for validity */ extern const char *optarg; /* argument associated with option */ +extern const wchar_t *woptarg; /* argument associated with option */ extern int Getopt(int nargc, char **nargv, const char *ostr); +extern int Getopt(int nargc, wchar_t **nargv, const char *ostr); + } //namespace Updater