rbnacl-libsodium 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (83) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +4 -0
  3. data/lib/rbnacl/libsodium/version.rb +1 -1
  4. data/vendor/libsodium/ChangeLog +10 -0
  5. data/vendor/libsodium/LICENSE +1 -1
  6. data/vendor/libsodium/Makefile.in +10 -2
  7. data/vendor/libsodium/THANKS +1 -0
  8. data/vendor/libsodium/autom4te.cache/output.1 +52 -17
  9. data/vendor/libsodium/autom4te.cache/output.3 +52 -17
  10. data/vendor/libsodium/autom4te.cache/requests +558 -558
  11. data/vendor/libsodium/autom4te.cache/traces.1 +543 -542
  12. data/vendor/libsodium/autom4te.cache/traces.3 +320 -319
  13. data/vendor/libsodium/build-aux/compile +347 -0
  14. data/vendor/libsodium/build-aux/config.guess +1568 -0
  15. data/vendor/libsodium/build-aux/config.sub +1793 -0
  16. data/vendor/libsodium/build-aux/depcomp +791 -0
  17. data/vendor/libsodium/build-aux/install-sh +527 -0
  18. data/vendor/libsodium/build-aux/ltmain.sh +9655 -0
  19. data/vendor/libsodium/build-aux/missing +215 -0
  20. data/vendor/libsodium/build-aux/test-driver +139 -0
  21. data/vendor/libsodium/builds/msvc/properties/Common.props +1 -3
  22. data/vendor/libsodium/builds/msvc/properties/Release.props +3 -1
  23. data/vendor/libsodium/builds/msvc/resource.rc +0 -0
  24. data/vendor/libsodium/builds/msvc/version.h +2 -2
  25. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.props +1 -1
  26. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +12 -6
  27. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +11 -5
  28. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.props +1 -1
  29. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +12 -6
  30. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +11 -5
  31. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.props +1 -1
  32. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +12 -6
  33. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +11 -5
  34. data/vendor/libsodium/configure +52 -17
  35. data/vendor/libsodium/configure.ac +7 -4
  36. data/vendor/libsodium/dist-build/ios.sh +4 -3
  37. data/vendor/libsodium/libsodium.vcxproj +4 -4
  38. data/vendor/libsodium/msvc-scripts/process.bat +2 -2
  39. data/vendor/libsodium/packaging/nuget/package.config +1 -1
  40. data/vendor/libsodium/packaging/nuget/package.nuspec +25 -25
  41. data/vendor/libsodium/packaging/nuget/package.targets +20 -20
  42. data/vendor/libsodium/src/libsodium/Makefile.in +2 -2
  43. data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h +2 -2
  44. data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h +8 -8
  45. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c +6 -6
  46. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h +2 -2
  47. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c +1 -1
  48. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h +2 -2
  49. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h +2 -2
  50. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +1 -1
  51. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c +1 -1
  52. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sysendian.h +2 -2
  53. data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c +38 -38
  54. data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c +8 -0
  55. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/fe_frombytes.c +10 -10
  56. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/fe_mul.c +10 -10
  57. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/fe_sq.c +10 -10
  58. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/fe_sq2.c +10 -10
  59. data/vendor/libsodium/src/libsodium/include/sodium.h +2 -2
  60. data/vendor/libsodium/src/libsodium/include/sodium/core.h +2 -2
  61. data/vendor/libsodium/src/libsodium/include/sodium/export.h +3 -3
  62. data/vendor/libsodium/src/libsodium/include/sodium/runtime.h +2 -2
  63. data/vendor/libsodium/src/libsodium/include/sodium/utils.h +4 -4
  64. data/vendor/libsodium/src/libsodium/include/sodium/version.h.in +2 -2
  65. data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +9 -9
  66. data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +9 -9
  67. data/vendor/libsodium/src/libsodium/sodium/utils.c +17 -15
  68. data/vendor/libsodium/test/default/Makefile.in +5 -4
  69. data/vendor/libsodium/test/default/aead_chacha20poly1305.c +25 -0
  70. data/vendor/libsodium/test/default/aead_chacha20poly1305.exp +4 -0
  71. data/vendor/libsodium/test/default/box_easy2.c +23 -8
  72. data/vendor/libsodium/test/default/box_easy2.exp +2 -0
  73. data/vendor/libsodium/test/default/generichash.c +23 -15
  74. data/vendor/libsodium/test/default/generichash3.c +24 -20
  75. data/vendor/libsodium/test/default/pwhash.c +27 -28
  76. data/vendor/libsodium/test/default/scalarmult6.c +19 -3
  77. data/vendor/libsodium/test/default/secretbox_easy2.c +27 -11
  78. data/vendor/libsodium/test/default/secretbox_easy2.exp +3 -0
  79. data/vendor/libsodium/test/default/shorthash.c +15 -10
  80. data/vendor/libsodium/test/default/sign.c +23 -0
  81. data/vendor/libsodium/test/default/sodium_utils2.c +4 -0
  82. data/vendor/libsodium/test/default/sodium_utils3.c +4 -0
  83. metadata +10 -2
data/vendor/libsodium/msvc-scripts/process.bat CHANGED
@@ -1,4 +1,4 @@
1
- cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.7.2/ < src\libsodium\include\sodium\version.h.in > tmp
1
+ cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.1/ < src\libsodium\include\sodium\version.h.in > tmp
2
2
  cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/7/ < tmp > tmp2
3
- cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < tmp2 > src\libsodium\include\sodium\version.h
3
+ cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > src\libsodium\include\sodium\version.h
4
4
  del tmp tmp2
data/vendor/libsodium/packaging/nuget/package.config CHANGED
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
2
  <!-- These values are populated into the package.gsl templates by package.bat. -->
3
3
  <!-- The target attribute controls path and file name only, id controls package naming. -->
4
- <package id="libsodium_vc120" target="libsodium" version = "0.7.0.0" pathversion="0_7_0_0" platformtoolset="v120" />
4
+ <package id="libsodium_vc120" target="libsodium" version = "1.0.0.0" pathversion="1_0_0_0" platformtoolset="v120" />
data/vendor/libsodium/packaging/nuget/package.nuspec CHANGED
@@ -7,7 +7,7 @@
7
7
  <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
8
8
  <metadata minClientVersion="2.5">
9
9
  <id>libsodium_vc120</id>
10
- <version>0.7.0.0</version>
10
+ <version>1.0.0.0</version>
11
11
  <title>libsodium_vc120</title>
12
12
  <authors>libsodium contributors</authors>
13
13
  <owners>Eric Voskuil</owners>
@@ -40,52 +40,52 @@
40
40
  <!-- libraries -->
41
41
 
42
42
  <!-- x86 Dynamic libraries (.dll) -->
43
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_7_0_0.dll" />
44
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_7_0_0.dll" />
43
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-1_0_0_0.dll" />
44
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-1_0_0_0.dll" />
45
45
 
46
46
  <!-- x86 Debugging symbols (.pdb) -->
47
- <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_7_0_0.pdb" />-->
48
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_7_0_0.pdb" />
47
+ <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-1_0_0_0.pdb" />-->
48
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-1_0_0_0.pdb" />
49
49
 
50
50
  <!-- x86 Import libraries (.imp.lib) -->
51
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-0_7_0_0.imp.lib" />
52
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_7_0_0.imp.lib" />
51
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-1_0_0_0.imp.lib" />
52
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-1_0_0_0.imp.lib" />
53
53
 
54
54
  <!-- x86 Export libraries (.exp) -->
55
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-0_7_0_0.exp" />
56
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_7_0_0.exp" />
55
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-1_0_0_0.exp" />
56
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-1_0_0_0.exp" />
57
57
 
58
58
  <!-- x86 Static libraries (.lib) -->
59
- <file src="..\..\bin\Win32\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_7_0_0.lib" />
60
- <file src="..\..\bin\Win32\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_7_0_0.lib" />
59
+ <file src="..\..\bin\Win32\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-1_0_0_0.lib" />
60
+ <file src="..\..\bin\Win32\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-1_0_0_0.lib" />
61
61
 
62
62
  <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
63
- <file src="..\..\bin\Win32\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_7_0_0.ltcg.lib" />
64
- <file src="..\..\bin\Win32\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_7_0_0.ltcg.lib" />
63
+ <file src="..\..\bin\Win32\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-1_0_0_0.ltcg.lib" />
64
+ <file src="..\..\bin\Win32\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-1_0_0_0.ltcg.lib" />
65
65
 
66
66
  <!-- x64 Dynamic libraries (.dll) -->
67
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_7_0_0.dll" />
68
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_7_0_0.dll" />
67
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-1_0_0_0.dll" />
68
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-1_0_0_0.dll" />
69
69
 
70
70
  <!-- x64 Debugging symbols (.pdb) -->
71
- <!--<file src="..\..\bin\x64\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_7_0_0.pdb" />-->
72
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_7_0_0.pdb" />
71
+ <!--<file src="..\..\bin\x64\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-1_0_0_0.pdb" />-->
72
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-1_0_0_0.pdb" />
73
73
 
74
74
  <!-- x64 Import libraries (.imp.lib) -->
75
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-0_7_0_0.imp.lib" />
76
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_7_0_0.imp.lib" />
75
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-1_0_0_0.imp.lib" />
76
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-1_0_0_0.imp.lib" />
77
77
 
78
78
  <!-- x64 Export libraries (.exp) -->
79
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-0_7_0_0.exp" />
80
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_7_0_0.exp" />
79
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-1_0_0_0.exp" />
80
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-1_0_0_0.exp" />
81
81
 
82
82
  <!-- x64 Static libraries (.lib) -->
83
- <file src="..\..\bin\x64\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_7_0_0.lib" />
84
- <file src="..\..\bin\x64\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_7_0_0.lib" />
83
+ <file src="..\..\bin\x64\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-1_0_0_0.lib" />
84
+ <file src="..\..\bin\x64\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-1_0_0_0.lib" />
85
85
 
86
86
  <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
87
- <file src="..\..\bin\x64\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_7_0_0.ltcg.lib" />
88
- <file src="..\..\bin\x64\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_7_0_0.ltcg.lib" />
87
+ <file src="..\..\bin\x64\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-1_0_0_0.ltcg.lib" />
88
+ <file src="..\..\bin\x64\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-1_0_0_0.ltcg.lib" />
89
89
  </files>
90
90
  <!--
91
91
  #################################################################
data/vendor/libsodium/packaging/nuget/package.targets CHANGED
@@ -30,66 +30,66 @@
30
30
  <!-- static libraries -->
31
31
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
32
32
  <Link>
33
- <AdditionalDependencies>libsodium-x86-v120-mt-s-0_7_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
33
+ <AdditionalDependencies>libsodium-x86-v120-mt-s-1_0_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
34
34
  </Link>
35
35
  </ItemDefinitionGroup>
36
36
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
37
37
  <Link>
38
- <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_7_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
38
+ <AdditionalDependencies>libsodium-x86-v120-mt-sgd-1_0_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
39
39
  </Link>
40
40
  </ItemDefinitionGroup>
41
41
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
42
42
  <Link>
43
- <AdditionalDependencies>libsodium-x64-v120-mt-s-0_7_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
43
+ <AdditionalDependencies>libsodium-x64-v120-mt-s-1_0_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
44
44
  </Link>
45
45
  </ItemDefinitionGroup>
46
46
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
47
47
  <Link>
48
- <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_7_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
48
+ <AdditionalDependencies>libsodium-x64-v120-mt-sgd-1_0_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
49
49
  </Link>
50
50
  </ItemDefinitionGroup>
51
51
 
52
52
  <!-- static ltcg libraries -->
53
53
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
54
54
  <Link>
55
- <AdditionalDependencies>libsodium-x86-v120-mt-s-0_7_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
55
+ <AdditionalDependencies>libsodium-x86-v120-mt-s-1_0_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
56
56
  </Link>
57
57
  </ItemDefinitionGroup>
58
58
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
59
59
  <Link>
60
- <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_7_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
60
+ <AdditionalDependencies>libsodium-x86-v120-mt-sgd-1_0_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
61
61
  </Link>
62
62
  </ItemDefinitionGroup>
63
63
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
64
64
  <Link>
65
- <AdditionalDependencies>libsodium-x64-v120-mt-s-0_7_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
65
+ <AdditionalDependencies>libsodium-x64-v120-mt-s-1_0_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
66
66
  </Link>
67
67
  </ItemDefinitionGroup>
68
68
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
69
69
  <Link>
70
- <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_7_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
70
+ <AdditionalDependencies>libsodium-x64-v120-mt-sgd-1_0_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
71
71
  </Link>
72
72
  </ItemDefinitionGroup>
73
73
 
74
74
  <!-- dynamic import libraries -->
75
75
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
76
76
  <Link>
77
- <AdditionalDependencies>libsodium-x86-v120-mt-0_7_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
77
+ <AdditionalDependencies>libsodium-x86-v120-mt-1_0_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
78
78
  </Link>
79
79
  </ItemDefinitionGroup>
80
80
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
81
81
  <Link>
82
- <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_7_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
82
+ <AdditionalDependencies>libsodium-x86-v120-mt-gd-1_0_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
83
83
  </Link>
84
84
  </ItemDefinitionGroup>
85
85
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
86
86
  <Link>
87
- <AdditionalDependencies>libsodium-x64-v120-mt-0_7_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
87
+ <AdditionalDependencies>libsodium-x64-v120-mt-1_0_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
88
88
  </Link>
89
89
  </ItemDefinitionGroup>
90
90
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
91
91
  <Link>
92
- <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_7_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
92
+ <AdditionalDependencies>libsodium-x64-v120-mt-gd-1_0_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
93
93
  </Link>
94
94
  </ItemDefinitionGroup>
95
95
 
@@ -98,26 +98,26 @@
98
98
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Release"
99
99
  Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
100
100
  AfterTargets="libsodium_AfterBuild">
101
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_7_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
102
- <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_7_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
101
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-1_0_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
102
+ <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-1_0_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
103
103
  </Target>
104
104
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Debug"
105
105
  Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
106
106
  AfterTargets="libsodium_AfterBuild">
107
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_7_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
108
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_7_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
107
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-1_0_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
108
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-1_0_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
109
109
  </Target>
110
110
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Release"
111
111
  Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
112
112
  AfterTargets="libsodium_AfterBuild">
113
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_7_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
114
- <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_7_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
113
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-1_0_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
114
+ <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-1_0_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
115
115
  </Target>
116
116
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Debug"
117
117
  Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
118
118
  AfterTargets="libsodium_AfterBuild">
119
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_7_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
120
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_7_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
119
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-1_0_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
120
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-1_0_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
121
121
  </Target>
122
122
 
123
123
  <!--
data/vendor/libsodium/src/libsodium/Makefile.in CHANGED
@@ -154,7 +154,7 @@ host_triplet = @host@
154
154
  @HAVE_LD_OUTPUT_DEF_TRUE@am__append_6 = -Wl,--output-def,libsodium-$(DLL_VERSION).def
155
155
  subdir = src/libsodium
156
156
  DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
157
- $(top_srcdir)/depcomp
157
+ $(top_srcdir)/build-aux/depcomp
158
158
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
159
159
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
160
160
  $(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -578,7 +578,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
578
578
  am__v_at_0 = @
579
579
  am__v_at_1 =
580
580
  DEFAULT_INCLUDES = -I.@am__isrc@
581
- depcomp = $(SHELL) $(top_srcdir)/depcomp
581
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
582
582
  am__depfiles_maybe = depfiles
583
583
  am__mv = mv -f
584
584
  CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h CHANGED
@@ -11,8 +11,8 @@
11
11
  this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
12
12
  */
13
13
 
14
- #ifndef __BLAKE2_IMPL_H__
15
- #define __BLAKE2_IMPL_H__
14
+ #ifndef blake2_impl_H
15
+ #define blake2_impl_H
16
16
 
17
17
  #include <stdint.h>
18
18
  #include <string.h>
data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h CHANGED
@@ -11,8 +11,8 @@
11
11
  this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
12
12
  */
13
13
 
14
- #ifndef __BLAKE2_H__
15
- #define __BLAKE2_H__
14
+ #ifndef blake2_H
15
+ #define blake2_H
16
16
 
17
17
  #include <stddef.h>
18
18
  #include <stdint.h>
@@ -58,7 +58,7 @@ extern "C" {
58
58
  };
59
59
 
60
60
  #pragma pack(push, 1)
61
- typedef struct __blake2s_param
61
+ typedef struct blake2s_param_
62
62
  {
63
63
  uint8_t digest_length; // 1
64
64
  uint8_t key_length; // 2
@@ -73,7 +73,7 @@ extern "C" {
73
73
  uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32
74
74
  } blake2s_param;
75
75
 
76
- ALIGN( 64 ) typedef struct __blake2s_state
76
+ ALIGN( 64 ) typedef struct blake2s_state_
77
77
  {
78
78
  uint32_t h[8];
79
79
  uint32_t t[2];
@@ -83,7 +83,7 @@ extern "C" {
83
83
  uint8_t last_node;
84
84
  } blake2s_state ;
85
85
 
86
- typedef struct __blake2b_param
86
+ typedef struct blake2b_param_
87
87
  {
88
88
  uint8_t digest_length; // 1
89
89
  uint8_t key_length; // 2
@@ -101,7 +101,7 @@ extern "C" {
101
101
  #ifndef DEFINE_BLAKE2B_STATE
102
102
  typedef crypto_generichash_blake2b_state blake2b_state;
103
103
  #else
104
- ALIGN( 64 ) typedef struct __blake2b_state
104
+ ALIGN( 64 ) typedef struct blake2b_state_
105
105
  {
106
106
  uint64_t h[8];
107
107
  uint64_t t[2];
@@ -112,7 +112,7 @@ typedef crypto_generichash_blake2b_state blake2b_state;
112
112
  } blake2b_state;
113
113
  #endif
114
114
 
115
- typedef struct __blake2sp_state
115
+ typedef struct blake2sp_state_
116
116
  {
117
117
  blake2s_state S[8][1];
118
118
  blake2s_state R[1];
@@ -120,7 +120,7 @@ typedef crypto_generichash_blake2b_state blake2b_state;
120
120
  size_t buflen;
121
121
  } blake2sp_state;
122
122
 
123
- typedef struct __blake2bp_state
123
+ typedef struct blake2bp_state_
124
124
  {
125
125
  blake2b_state S[4][1];
126
126
  blake2b_state R[1];
data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c CHANGED
@@ -96,10 +96,10 @@ crypto_onetimeauth_poly1305_donna_implementation_name(void)
96
96
 
97
97
  struct crypto_onetimeauth_poly1305_implementation
98
98
  crypto_onetimeauth_poly1305_donna_implementation = {
99
- _SODIUM_C99(.implementation_name =) crypto_onetimeauth_poly1305_donna_implementation_name,
100
- _SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_donna,
101
- _SODIUM_C99(.onetimeauth_verify =) crypto_onetimeauth_poly1305_donna_verify,
102
- _SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_donna_init,
103
- _SODIUM_C99(.onetimeauth_update =) crypto_onetimeauth_poly1305_donna_update,
104
- _SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_donna_final
99
+ SODIUM_C99(.implementation_name =) crypto_onetimeauth_poly1305_donna_implementation_name,
100
+ SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_donna,
101
+ SODIUM_C99(.onetimeauth_verify =) crypto_onetimeauth_poly1305_donna_verify,
102
+ SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_donna_init,
103
+ SODIUM_C99(.onetimeauth_update =) crypto_onetimeauth_poly1305_donna_update,
104
+ SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_donna_final
105
105
  };
data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h CHANGED
@@ -1,5 +1,5 @@
1
- #ifndef __POLY1305_DONNA_H__
2
- #define __POLY1305_DONNA_H__
1
+ #ifndef poly1305_donna_H
2
+ #define poly1305_donna_H
3
3
 
4
4
  #include <stddef.h>
5
5
 
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c CHANGED
@@ -75,7 +75,7 @@ decode64_one(uint32_t * dst, uint8_t src)
75
75
  const char *ptr = strchr(itoa64, src);
76
76
 
77
77
  if (ptr) {
78
- *dst = ptr - itoa64;
78
+ *dst = (uint32_t) (ptr - itoa64);
79
79
  return 0;
80
80
  }
81
81
  *dst = 0;
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h CHANGED
@@ -27,8 +27,8 @@
27
27
  * This file was originally written by Colin Percival as part of the Tarsnap
28
28
  * online backup system.
29
29
  */
30
- #ifndef _CRYPTO_SCRYPT_H_
31
- #define _CRYPTO_SCRYPT_H_
30
+ #ifndef crypto_scrypt_H
31
+ #define crypto_scrypt_H
32
32
 
33
33
  #include <stdint.h>
34
34
 
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h CHANGED
@@ -25,8 +25,8 @@
25
25
  *
26
26
  */
27
27
 
28
- #ifndef _SHA256_H_
29
- #define _SHA256_H_
28
+ #ifndef pbkdf2_sha256_H
29
+ #define pbkdf2_sha256_H
30
30
 
31
31
  #include <sys/types.h>
32
32
 
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c CHANGED
@@ -34,7 +34,7 @@ pickparams(unsigned long long opslimit, const size_t memlimit,
34
34
  }
35
35
  }
36
36
  } else {
37
- maxN = memlimit / (*r * 128);
37
+ maxN = memlimit / ((size_t) *r * 128);
38
38
  for (*N_log2 = 1; *N_log2 < 63; *N_log2 += 1) {
39
39
  if ((uint64_t) (1) << *N_log2 > maxN / 2) {
40
40
  break;
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c CHANGED
@@ -379,7 +379,7 @@ escrypt_kdf_sse(escrypt_local_t * local,
379
379
  /* 2: for i = 0 to p - 1 do */
380
380
  for (i = 0; i < p; i++) {
381
381
  /* 3: B_i <-- MF(B_i, N) */
382
- smix(&B[(size_t)128 * i * r], r, N, V, XY);
382
+ smix(&B[(size_t)128 * i * r], r, (uint32_t) N, V, XY);
383
383
  }
384
384
 
385
385
  /* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sysendian.h CHANGED
@@ -1,5 +1,5 @@
1
- #ifndef _SYSENDIAN_H_
2
- #define _SYSENDIAN_H_
1
+ #ifndef sysendian_H
2
+ #define sysendian_H
3
3
 
4
4
  #include <stdint.h>
5
5
 
data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c CHANGED
@@ -36,10 +36,10 @@ typedef limb felem[5];
36
36
  typedef unsigned uint128_t __attribute__((mode(TI)));
37
37
 
38
38
  #undef force_inline
39
- #define force_inline inline __attribute__((always_inline))
39
+ #define force_inline __attribute__((always_inline))
40
40
 
41
41
  /* Sum two numbers: output += in */
42
- static force_inline void
42
+ static inline void force_inline
43
43
  fsum(limb *output, const limb *in) {
44
44
  output[0] += in[0];
45
45
  output[1] += in[1];
@@ -54,7 +54,7 @@ fsum(limb *output, const limb *in) {
54
54
  * Assumes that out[i] < 2**52
55
55
  * On return, out[i] < 2**55
56
56
  */
57
- static force_inline void
57
+ static inline void force_inline
58
58
  fdifference_backwards(felem out, const felem in) {
59
59
  /* 152 is 19 << 3 */
60
60
  static const limb two54m152 = (((limb)1) << 54) - 152;
@@ -68,7 +68,7 @@ fdifference_backwards(felem out, const felem in) {
68
68
  }
69
69
 
70
70
  /* Multiply a number by a scalar: output = in * scalar */
71
- static force_inline void
71
+ static inline void force_inline
72
72
  fscalar_product(felem output, const felem in, const limb scalar) {
73
73
  uint128_t a;
74
74
 
@@ -98,7 +98,7 @@ fscalar_product(felem output, const felem in, const limb scalar) {
98
98
  * Assumes that in[i] < 2**55 and likewise for in2.
99
99
  * On return, output[i] < 2**52
100
100
  */
101
- static force_inline void
101
+ static inline void force_inline
102
102
  fmul(felem output, const felem in2, const felem in) {
103
103
  uint128_t t[5];
104
104
  limb r0,r1,r2,r3,r4,s0,s1,s2,s3,s4,c;
@@ -147,7 +147,7 @@ fmul(felem output, const felem in2, const felem in) {
147
147
  output[4] = r4;
148
148
  }
149
149
 
150
- static force_inline void
150
+ static inline void force_inline
151
151
  fsquare_times(felem output, const felem in, limb count) {
152
152
  uint128_t t[5];
153
153
  limb r0,r1,r2,r3,r4,c;
@@ -190,43 +190,43 @@ fsquare_times(felem output, const felem in, limb count) {
190
190
  }
191
191
 
192
192
  #if !defined(CPU_ALIGNED_ACCESS_REQUIRED) && defined(NATIVE_LITTLE_ENDIAN)
193
- # define U8TO64(p) (*((const uint64_t *) (p)))
194
- # define U64TO8(p, v) (*((uint64_t *) (p)) = (v))
193
+ # define load_limb(p) (*((const limb *) (p)))
194
+ # define store_limb(p, v) (*((limb *) (p)) = (v))
195
195
  #else
196
- static force_inline uint64_t
197
- U8TO64(const unsigned char *p) {
198
- return
199
- (((uint64_t)(p[0] & 0xff) ) |
200
- ((uint64_t)(p[1] & 0xff) << 8) |
201
- ((uint64_t)(p[2] & 0xff) << 16) |
202
- ((uint64_t)(p[3] & 0xff) << 24) |
203
- ((uint64_t)(p[4] & 0xff) << 32) |
204
- ((uint64_t)(p[5] & 0xff) << 40) |
205
- ((uint64_t)(p[6] & 0xff) << 48) |
206
- ((uint64_t)(p[7] & 0xff) << 56));
196
+ static inline limb force_inline
197
+ load_limb(const u8 *in) {
198
+ return
199
+ ((limb)in[0]) |
200
+ (((limb)in[1]) << 8) |
201
+ (((limb)in[2]) << 16) |
202
+ (((limb)in[3]) << 24) |
203
+ (((limb)in[4]) << 32) |
204
+ (((limb)in[5]) << 40) |
205
+ (((limb)in[6]) << 48) |
206
+ (((limb)in[7]) << 56);
207
207
  }
208
208
 
209
- static force_inline void
210
- U64TO8(unsigned char *p, uint64_t v) {
211
- p[0] = (v ) & 0xff;
212
- p[1] = (v >> 8) & 0xff;
213
- p[2] = (v >> 16) & 0xff;
214
- p[3] = (v >> 24) & 0xff;
215
- p[4] = (v >> 32) & 0xff;
216
- p[5] = (v >> 40) & 0xff;
217
- p[6] = (v >> 48) & 0xff;
218
- p[7] = (v >> 56) & 0xff;
209
+ static inline void force_inline
210
+ store_limb(u8 *out, limb in) {
211
+ out[0] = in & 0xff;
212
+ out[1] = (in >> 8) & 0xff;
213
+ out[2] = (in >> 16) & 0xff;
214
+ out[3] = (in >> 24) & 0xff;
215
+ out[4] = (in >> 32) & 0xff;
216
+ out[5] = (in >> 40) & 0xff;
217
+ out[6] = (in >> 48) & 0xff;
218
+ out[7] = (in >> 56) & 0xff;
219
219
  }
220
220
  #endif
221
221
 
222
222
  /* Take a little-endian, 32-byte number and expand it into polynomial form */
223
223
  static void
224
224
  fexpand(limb *output, const u8 *in) {
225
- output[0] = U8TO64(in) & 0x7ffffffffffff;
226
- output[1] = (U8TO64(in+6) >> 3) & 0x7ffffffffffff;
227
- output[2] = (U8TO64(in+12) >> 6) & 0x7ffffffffffff;
228
- output[3] = (U8TO64(in+19) >> 1) & 0x7ffffffffffff;
229
- output[4] = (U8TO64(in+25) >> 4) & 0x7ffffffffffff;
225
+ output[0] = load_limb(in) & 0x7ffffffffffff;
226
+ output[1] = (load_limb(in+6) >> 3) & 0x7ffffffffffff;
227
+ output[2] = (load_limb(in+12) >> 6) & 0x7ffffffffffff;
228
+ output[3] = (load_limb(in+19) >> 1) & 0x7ffffffffffff;
229
+ output[4] = (load_limb(in+24) >> 12) & 0x7ffffffffffff;
230
230
  }
231
231
 
232
232
  /* Take a fully reduced polynomial form number and contract it into a
@@ -281,10 +281,10 @@ fcontract(u8 *output, const felem input) {
281
281
  t[4] += t[3] >> 51; t[3] &= 0x7ffffffffffff;
282
282
  t[4] &= 0x7ffffffffffff;
283
283
 
284
- U64TO8(output, t[0] | (t[1] << 51));
285
- U64TO8(output + 8, (t[1] >> 13) | (t[2] << 38));
286
- U64TO8(output + 16, (t[2] >> 26) | (t[3] << 25));
287
- U64TO8(output + 24, (t[3] >> 39) | (t[4] << 12));
284
+ store_limb(output, t[0] | (t[1] << 51));
285
+ store_limb(output + 8, (t[1] >> 13) | (t[2] << 38));
286
+ store_limb(output + 16, (t[2] >> 26) | (t[3] << 25));
287
+ store_limb(output + 24, (t[3] >> 39) | (t[4] << 12));
288
288
  }
289
289
 
290
290
  /* Input: Q, Q', Q-Q'