Moved header files from dedicated include dir back into src/ (nevermind this idea; CMake packs the ed25519.h in shared builds into the nice output include dir just fine on its own).

Modified CHANGELOG accordingly.

Copy license.txt into CMake build output dir on package.

Added "ORLP_" prefix to ed25519.h header guard macro to prevent potential name clashes.

Author: GlitchedPolygons

CHANGELOG

@@ -1,11 +1,12 @@
-Raphael Beck, the 8th of October, 2020
+Raphael Beck, the 9th of October, 2020
 
 ---
 
 As per the Zlib license used by this project, here are the changes
-that I've applied, in order or importance/relevance:
+that I've applied, in order of importance/relevance:
 
-* Moved header files into dedicated include directory.
 * Added “ORLP_” prefix to declspec macro (to prevent possible collisions with other libraries making use of the same name).
 * Added CMakeLists.txt and build.sh for easy packaging and inclusion into other projects.
 * Deleted .dll files inside repo.
+* Adapted readme.md accordingly.
+* Added this CHANGELOG file.

CMakeLists.txt

@@ -21,18 +21,14 @@ if (${ORLP_ED25519_DLL})
     add_compile_definitions("ORLP_ED25519_DLL=1")
 endif ()
 
-set(ORLP_ED25519_INCLUDE_DIR
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        )
-
 set(ORLP_ED25519_SRC
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/precomp_data.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/fixedint.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/ed25519.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/sha512.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/ge.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/fe.h
-        ${CMAKE_CURRENT_LIST_DIR}/include/orlp-ed25519/sc.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/precomp_data.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/fixedint.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/ed25519.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/sha512.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/ge.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/fe.h
+        ${CMAKE_CURRENT_LIST_DIR}/src/sc.h
         ${CMAKE_CURRENT_LIST_DIR}/src/ge.c
         ${CMAKE_CURRENT_LIST_DIR}/src/fe.c
         ${CMAKE_CURRENT_LIST_DIR}/src/sc.c
@@ -72,7 +68,12 @@ if (${ORLP_ED25519_PACKAGE})
 
     add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD COMMAND ${CMAKE_COMMAND}
-            -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/include "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/include"
+            -E copy ${CMAKE_CURRENT_LIST_DIR}/src/ed25519.h "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/include/orlp-ed25519/ed25519.h"
+            )
+
+    add_custom_command(TARGET ${PROJECT_NAME}
+            POST_BUILD COMMAND ${CMAKE_COMMAND}
+            -E copy ${CMAKE_CURRENT_LIST_DIR}/license.txt "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/license.txt"
             )
 
     string(TOLOWER "${PROJECT_NAME}-${ORLP_ED25519_VERSION_STRING}-${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}.tar.gz" ${PROJECT_NAME}_OUTPUT_ARCHIVE_FILENAME)
@@ -83,4 +84,4 @@ if (${ORLP_ED25519_PACKAGE})
             )
 endif ()
 
-target_include_directories(${PROJECT_NAME} PUBLIC ${ORLP_ED25519_INCLUDE_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src)

readme.md

@@ -37,8 +37,7 @@ 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.
+library, only copy `ed25519.h` and define `ORLP_ED25519_DLL` before importing.
 
 There are no defined types for seeds, private keys, public keys, shared secrets
 or signatures. Instead simple `unsigned char` buffers are used with the

src/add_scalar.c

@@ -1,7 +1,7 @@
-#include "../include/orlp-ed25519/ed25519.h"
-#include "../include/orlp-ed25519/ge.h"
-#include "../include/orlp-ed25519/sc.h"
-#include "../include/orlp-ed25519/sha512.h"
+#include "ed25519.h"
+#include "ge.h"
+#include "sc.h"
+#include "sha512.h"
 
 
 /* see http://crypto.stackexchange.com/a/6215/4697 */

include/orlp-ed25519/ed25519.h src/ed25519.hinclude/orlp-ed25519/ed25519.h renamed to src/ed25519.h

@@ -1,5 +1,5 @@
-#ifndef ED25519_H
-#define ED25519_H
+#ifndef ORLP_ED25519_H
+#define ORLP_ED25519_H
 
 #include <stddef.h>
 
@@ -35,4 +35,4 @@ void ORLP_ED25519_DECLSPEC ed25519_key_convert_ref10_to_orlp(const unsigned char
 }
 #endif
 
-#endif
+#endif // ORLP_ED25519_H

src/fe.c

@@ -1,5 +1,5 @@
-#include "../include/orlp-ed25519/fixedint.h"
-#include "../include/orlp-ed25519/fe.h"
+#include "fixedint.h"
+#include "fe.h"
 
 
 /*

include/orlp-ed25519/fe.h src/fe.hinclude/orlp-ed25519/fe.h renamed to src/fe.h

@@ -1,5 +1,5 @@
-#include "../include/orlp-ed25519/ge.h"
-#include "../include/orlp-ed25519/precomp_data.h"
+#include "ge.h"
+#include "precomp_data.h"
 
 
 /*