Skip to content

Commit

Permalink
Rename nacl.h to naclite.h
Browse files Browse the repository at this point in the history
This should avoid confusion with header files from the reference implementation and libsodium
  • Loading branch information
noloader committed Jan 21, 2018
1 parent 1df1d25 commit 8ffd165
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Filelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ mqueue.cpp
mqueue.h
mqv.cpp
mqv.h
nacl.h
naclite.h
nbtheory.cpp
nbtheory.h
neon-simd.cpp
Expand Down
2 changes: 1 addition & 1 deletion TestScripts/tweetnacl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
+
+#include "pch.h"
+#include "config.h"
+#include "nacl.h"
+#include "naclite.h"
+#include "misc.h"
+#include "osrng.h"
+#include "stdcpp.h"
Expand Down
2 changes: 1 addition & 1 deletion cryptlib.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@
<ClInclude Include="modexppc.h" />
<ClInclude Include="mqueue.h" />
<ClInclude Include="mqv.h" />
<ClInclude Include="nacl.h" />
<ClInclude Include="naclite.h" />
<ClInclude Include="nbtheory.h" />
<ClInclude Include="network.h" />
<ClInclude Include="nr.h" />
Expand Down
2 changes: 1 addition & 1 deletion cryptlib.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@
<ClInclude Include="nbtheory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="nacl.h">
<ClInclude Include="naclite.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="network.h">
Expand Down
4 changes: 2 additions & 2 deletions nacl.h → naclite.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// nacl.h - written and placed in the public domain by Jeffrey Walton
// naclite.h - written and placed in the public domain by Jeffrey Walton
// based on public domain NaCl source code written by
// Daniel J. Bernstein, Bernard van Gastel, Wesley Janssen,
// Tanja Lange, Peter Schwabe and Sjaak Smetsers.

/// \file nacl.h
/// \file naclite.h
/// \brief Crypto++ interface to TweetNaCl library (20140917)
/// \details TweetNaCl is a compact reimplementation of the NaCl library by
/// Daniel J. Bernstein, Bernard van Gastel, Wesley Janssen, Tanja Lange,
Expand Down
2 changes: 1 addition & 1 deletion tweetnacl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "pch.h"
#include "config.h"
#include "nacl.h"
#include "naclite.h"
#include "misc.h"
#include "osrng.h"
#include "stdcpp.h"
Expand Down
4 changes: 2 additions & 2 deletions validat4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "cryptlib.h"
#include "secblock.h"
#include "integer.h"
#include "nacl.h"
#include "naclite.h"

#include <iostream>
#include <iomanip>
Expand Down Expand Up @@ -485,7 +485,7 @@ bool TestCryptoSignKeys()
// NaCl requires an integrated random number generator; see randombytes()
// in tweetnacl.cpp. We use DefaultAutoSeededRNG but it means we need
// Operating System features to seed the generator. If you use another
// generator, like RDRAND, then undefine CRYPTOPP_DISABLE_NACL in nacl.h.
// generator, like RDRAND, then undefine CRYPTOPP_DISABLE_NACL in naclite.h.
bool ValidateNaCl()
{
std::cout << "\nTesting NaCl library functions...\n\n";
Expand Down

0 comments on commit 8ffd165

Please sign in to comment.