SConstruct: Add ed25519.c

Conflicts:
	Builds/VisualStudio2013/RippleD.vcxproj
	Builds/VisualStudio2013/RippleD.vcxproj.filters
	SConstruct
This commit is contained in:
Josh Juran
2014-11-18 10:40:20 -08:00
committed by Vinnie Falco
parent fcd20b63fe
commit 1c71b274f0
5 changed files with 170 additions and 1 deletions

View File

@@ -991,6 +991,57 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\weak_fn.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-64bit.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-helpers.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-sse2.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-32bit-sse2.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-32bit-tables.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-sse2.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-tables.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-x86-32bit.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-x86.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-basepoint-table.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-batchverify.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-impl-base.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-impl-sse2.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-portable-identify.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-portable.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-hash-custom.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-hash.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-randombytes-custom.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-randombytes.h">
</ClInclude>
<ClCompile Include="..\..\src\ed25519-donna\ed25519.c">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ed25519-donna\ed25519.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\modm-donna-32bit.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\modm-donna-64bit.h">
</ClInclude>
<ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -3222,6 +3273,10 @@
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\crypto.cpp">
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\ed25519.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\ed25519-donna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\ed25519-donna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\git_id.cpp">
</ClCompile>
<ClInclude Include="..\..\src\ripple\unity\git_id.h">

View File

@@ -202,6 +202,9 @@
<Filter Include="build\proto">
<UniqueIdentifier>{5D2BC8F1-FF8F-3CCC-7292-795D59EB927A}</UniqueIdentifier>
</Filter>
<Filter Include="ed25519-donna">
<UniqueIdentifier>{9DEED977-2072-A182-5BD9-CEBF206E8C91}</UniqueIdentifier>
</Filter>
<Filter Include="hyperleveldb">
<UniqueIdentifier>{5536F5D2-F4A4-3648-B43C-F95CBA3FC635}</UniqueIdentifier>
</Filter>
@@ -1686,6 +1689,81 @@
<ClInclude Include="..\..\src\beast\beast\weak_fn.h">
<Filter>beast</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-64bit.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-helpers.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-sse2.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-32bit-sse2.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-32bit-tables.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-sse2.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-tables.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-x86-32bit.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-64bit-x86.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-basepoint-table.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-batchverify.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-impl-base.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-impl-sse2.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-portable-identify.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna-portable.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-donna.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-hash-custom.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-hash.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-randombytes-custom.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\ed25519-randombytes.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ed25519-donna\ed25519.c">
<Filter>ed25519-donna</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ed25519-donna\ed25519.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\modm-donna-32bit.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\modm-donna-64bit.h">
<Filter>ed25519-donna</Filter>
</ClInclude>
<ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
<Filter>hyperleveldb\db</Filter>
</ClCompile>
@@ -4386,6 +4464,9 @@
<ClCompile Include="..\..\src\ripple\unity\crypto.cpp">
<Filter>ripple\unity</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\ed25519.c">
<Filter>ripple\unity</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\git_id.cpp">
<Filter>ripple\unity</Filter>
</ClCompile>

View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.30110.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}"
EndProject
@@ -14,9 +14,11 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|Win32.ActiveCfg = debug|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|Win32.Build.0 = debug|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|x64.ActiveCfg = debug|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|x64.Build.0 = debug|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|Win32.ActiveCfg = release|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|Win32.Build.0 = release|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|x64.ActiveCfg = release|x64
{26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|x64.Build.0 = release|x64
EndGlobalSection

View File

@@ -660,6 +660,13 @@ for tu_style in ['classic', 'unity']:
else:
no_uninitialized_warning = {}
object_builder.add_source_files(
'src/ripple/unity/ed25519.c',
CPPPATH=[
'src/ed25519-donna',
]
)
object_builder.add_source_files(
'src/ripple/unity/leveldb.cpp',
CPPPATH=[

View File

@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
/*
This file is part of rippled: https://github.com/ripple/rippled
Copyright (c) 2014 Ripple Labs Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
#ifndef _MSC_VER
#include <sys/param.h>
#undef ALIGN
#endif
#include <ed25519.c>