Rename nacl.h to naclite.h

This should avoid confusion with header files from the reference implementation and libsodium

7 files changed, 9 insertions, 9 deletions

diff --git a/Filelist.txt b/Filelist.txt
index 7bfd69b0..c09372cd 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -183,7 +183,7 @@ mqueue.cpp
 mqueue.h

 mqv.cpp

 mqv.h

-nacl.h

+naclite.h

 nbtheory.cpp

 nbtheory.h

 neon-simd.cpp

diff --git a/TestScripts/tweetnacl.patch b/TestScripts/tweetnacl.patch
index ae0948d4..7292ef37 100644
--- a/TestScripts/tweetnacl.patch
+++ b/TestScripts/tweetnacl.patch
@@ -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"
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index fd6e58fc..fff3f475 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -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" />

diff --git a/cryptlib.vcxproj.filters b/cryptlib.vcxproj.filters
index 7925460a..c1fd8c01 100644
--- a/cryptlib.vcxproj.filters
+++ b/cryptlib.vcxproj.filters
@@ -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">

diff --git a/nacl.h b/naclite.h
index 10a0a487..c8e937f0 100644
--- a/nacl.h
+++ b/naclite.h
@@ -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,

diff --git a/tweetnacl.cpp b/tweetnacl.cpp
index 9d546e7f..96192886 100644
--- a/tweetnacl.cpp
+++ b/tweetnacl.cpp
@@ -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"

diff --git a/validat4.cpp b/validat4.cpp
index 70a2e738..a7f3ca69 100644
--- a/validat4.cpp
+++ b/validat4.cpp
@@ -18,7 +18,7 @@
 #include "cryptlib.h"

 #include "secblock.h"

 #include "integer.h"

-#include "nacl.h"

+#include "naclite.h"

 

 #include <iostream>

 #include <iomanip>

@@ -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";