Modify header names according to ACR

Change-Id: I0bf4ad69d5f2c5796d26e2970ab4ef9d9583b91c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4f6ac..e2b5e35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
 ENDIF()
 
 ## Subdirectories ##############################################################
-SET(API_FOLDER ${PROJECT_SOURCE_DIR}/api)
+SET(API_FOLDER ${PROJECT_SOURCE_DIR}/api/yaca)
 SET(EXAMPLES_FOLDER ${PROJECT_SOURCE_DIR}/examples)
 SET(SRC_FOLDER ${PROJECT_SOURCE_DIR}/src)
 

diff --git a/api/yaca/crypto.h b/api/yaca/yaca_crypto.h
similarity index 99%
rename from api/yaca/crypto.h
rename to api/yaca/yaca_crypto.h
index 5a44a9d..1fabf47 100644 (file)
--- a/api/yaca/crypto.h
+++ b/api/yaca/yaca_crypto.h
@@ -25,7 +25,7 @@
 #define YACA_CRYPTO_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/digest.h b/api/yaca/yaca_digest.h
similarity index 99%
rename from api/yaca/digest.h
rename to api/yaca/yaca_digest.h
index 1938360..cb27246 100644 (file)
--- a/api/yaca/digest.h
+++ b/api/yaca/yaca_digest.h
@@ -25,7 +25,7 @@
 #define YACA_DIGEST_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/encrypt.h b/api/yaca/yaca_encrypt.h
similarity index 99%
rename from api/yaca/encrypt.h
rename to api/yaca/yaca_encrypt.h
index de7bc58..94bedff 100644 (file)
--- a/api/yaca/encrypt.h
+++ b/api/yaca/yaca_encrypt.h
@@ -25,7 +25,7 @@
 #define YACA_ENCRYPT_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/error.h b/api/yaca/yaca_error.h
similarity index 100%
rename from api/yaca/error.h
rename to api/yaca/yaca_error.h

diff --git a/api/yaca/key.h b/api/yaca/yaca_key.h
similarity index 99%
rename from api/yaca/key.h
rename to api/yaca/yaca_key.h
index e03834d..4c4642c 100755 (executable)
--- a/api/yaca/key.h
+++ b/api/yaca/yaca_key.h
@@ -25,7 +25,7 @@
 #define YACA_KEY_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/seal.h b/api/yaca/yaca_seal.h
similarity index 99%
rename from api/yaca/seal.h
rename to api/yaca/yaca_seal.h
index 2940f01..0b7f808 100644 (file)
--- a/api/yaca/seal.h
+++ b/api/yaca/yaca_seal.h
@@ -25,7 +25,7 @@
 #define YACA_SEAL_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/sign.h b/api/yaca/yaca_sign.h
similarity index 99%
rename from api/yaca/sign.h
rename to api/yaca/yaca_sign.h
index 36ba4dc..9deebec 100644 (file)
--- a/api/yaca/sign.h
+++ b/api/yaca/yaca_sign.h
@@ -25,7 +25,7 @@
 #define YACA_SIGN_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/simple.h b/api/yaca/yaca_simple.h
similarity index 99%
rename from api/yaca/simple.h
rename to api/yaca/yaca_simple.h
index 9c62314..f743de2 100644 (file)
--- a/api/yaca/simple.h
+++ b/api/yaca/yaca_simple.h
@@ -25,7 +25,7 @@
 #define YACA_SIMPLE_H
 
 #include <stddef.h>
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/api/yaca/types.h b/api/yaca/yaca_types.h
similarity index 100%
rename from api/yaca/types.h
rename to api/yaca/yaca_types.h

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0d6f3e1..af00c1c 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -20,7 +20,7 @@
 # @author Krzysztof Jackiewicz (k.jackiewicz@samsung.com)
 #
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/api)
+INCLUDE_DIRECTORIES(${API_FOLDER})
 
 SET(COMMON_SOURCES  ${CMAKE_CURRENT_SOURCE_DIR}/lorem.c
                     ${CMAKE_CURRENT_SOURCE_DIR}/misc.c)

diff --git a/examples/digest.c b/examples/digest.c
index 9e01fc1..685bd8a 100644 (file)
--- a/examples/digest.c
+++ b/examples/digest.c
@@ -21,10 +21,10 @@
  * @brief
  */
 
-#include <yaca/crypto.h>
-#include <yaca/digest.h>
-#include <yaca/simple.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_digest.h>
+#include <yaca_simple.h>
+#include <yaca_error.h>
 
 #include "lorem.h"
 #include "misc.h"

diff --git a/examples/encrypt.c b/examples/encrypt.c
index ec2ee2f..0ee5e42 100644 (file)
--- a/examples/encrypt.c
+++ b/examples/encrypt.c
@@ -23,11 +23,11 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/simple.h>
-#include <yaca/encrypt.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_simple.h>
+#include <yaca_encrypt.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
 
 #include "lorem.h"
 #include "misc.h"

diff --git a/examples/encrypt_aes_gcm_ccm.c b/examples/encrypt_aes_gcm_ccm.c
index 4ae8ff6..7fe5305 100644 (file)
--- a/examples/encrypt_aes_gcm_ccm.c
+++ b/examples/encrypt_aes_gcm_ccm.c
@@ -23,10 +23,10 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/encrypt.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_encrypt.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
 
 #include "lorem.h"
 #include "misc.h"

diff --git a/examples/key_exchange.c b/examples/key_exchange.c
index 559059e..80bce46 100644 (file)
--- a/examples/key_exchange.c
+++ b/examples/key_exchange.c
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
 
 #include "misc.h"
 #include "../src/debug.h"

diff --git a/examples/key_import_export.c b/examples/key_import_export.c
index 9c44266..6b647fd 100644 (file)
--- a/examples/key_import_export.c
+++ b/examples/key_import_export.c
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
 
 #include "misc.h"
 #include "../src/debug.h"

diff --git a/examples/key_password.c b/examples/key_password.c
index e3e20c2..d76f195 100644 (file)
--- a/examples/key_password.c
+++ b/examples/key_password.c
@@ -18,10 +18,10 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <yaca/crypto.h>
-#include <yaca/key.h>
-#include <yaca/types.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_key.h>
+#include <yaca_types.h>
+#include <yaca_error.h>
 #include "misc.h"
 #include "../src/debug.h"
 

diff --git a/examples/misc.c b/examples/misc.c
index 1846d5e..7eaedf3 100644 (file)
--- a/examples/misc.c
+++ b/examples/misc.c
@@ -29,7 +29,7 @@
 
 #include <openssl/bio.h>
 
-#include <yaca/crypto.h>
+#include <yaca_crypto.h>
 
 #include "misc.h"
 

diff --git a/examples/seal.c b/examples/seal.c
index 0811f43..a2359a7 100644 (file)
--- a/examples/seal.c
+++ b/examples/seal.c
@@ -23,10 +23,10 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/seal.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_seal.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
 
 #include "lorem.h"
 #include "misc.h"

diff --git a/examples/sign.c b/examples/sign.c
index a6f4ee8..48f6dca 100644 (file)
--- a/examples/sign.c
+++ b/examples/sign.c
@@ -23,11 +23,11 @@
 
 #include <stdio.h>
 
-#include <yaca/crypto.h>
-#include <yaca/sign.h>
-#include <yaca/key.h>
-#include <yaca/error.h>
-#include <yaca/simple.h>
+#include <yaca_crypto.h>
+#include <yaca_sign.h>
+#include <yaca_key.h>
+#include <yaca_error.h>
+#include <yaca_simple.h>
 
 #include "lorem.h"
 #include "misc.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2e511e..ae4168b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,7 +25,7 @@ PROJECT(yaca)
 MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the yaca...")
 
-FILE(GLOB HEADERS   ${API_FOLDER}/yaca/*.h)
+FILE(GLOB HEADERS   ${API_FOLDER}/*.h)
 FILE(GLOB SRCS      *.c *.h)
 
 SET(_LIB_VERSION_ "${VERSION}")

diff --git a/src/crypto.c b/src/crypto.c
index d52468d..c0ce1f4 100644 (file)
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -30,8 +30,8 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 
-#include <yaca/crypto.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_error.h>
 
 #include "internal.h"
 

diff --git a/src/digest.c b/src/digest.c
index 28b095e..a7e9bbe 100644 (file)
--- a/src/digest.c
+++ b/src/digest.c
@@ -25,9 +25,9 @@
 
 #include <openssl/evp.h>
 
-#include <yaca/crypto.h>
-#include <yaca/digest.h>
-#include <yaca/error.h>
+#include <yaca_crypto.h>
+#include <yaca_digest.h>
+#include <yaca_error.h>
 
 #include "internal.h"
 

diff --git a/src/encrypt.c b/src/encrypt.c
index c3d93ee..c059c7e 100644 (file)
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -26,10 +26,10 @@
 
 #include <openssl/evp.h>
 
-#include <yaca/crypto.h>
-#include <yaca/encrypt.h>
-#include <yaca/error.h>
-#include <yaca/key.h>
+#include <yaca_crypto.h>
+#include <yaca_encrypt.h>
+#include <yaca_error.h>
+#include <yaca_key.h>
 
 #include "internal.h"
 

diff --git a/src/internal.h b/src/internal.h
index 16b8b38..660bbd2 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -29,7 +29,7 @@
 #include <openssl/ossl_typ.h>
 #include <openssl/err.h>
 
-#include <yaca/types.h>
+#include <yaca_types.h>
 
 #define API __attribute__ ((visibility ("default")))
 

diff --git a/src/key.c b/src/key.c
index 8077f31..dd4e648 100755 (executable)
--- a/src/key.c
+++ b/src/key.c
@@ -34,9 +34,9 @@
 #include <openssl/des.h>
 #include <openssl/err.h>
 
-#include <yaca/crypto.h>
-#include <yaca/error.h>
-#include <yaca/key.h>
+#include <yaca_crypto.h>
+#include <yaca_error.h>
+#include <yaca_key.h>
 
 #include "internal.h"
 

diff --git a/src/seal.c b/src/seal.c
index a3d3eb1..1dc583e 100644 (file)
--- a/src/seal.c
+++ b/src/seal.c
@@ -26,10 +26,10 @@
 
 #include <openssl/evp.h>
 
-#include <yaca/crypto.h>
-#include <yaca/seal.h>
-#include <yaca/error.h>
-#include <yaca/key.h>
+#include <yaca_crypto.h>
+#include <yaca_seal.h>
+#include <yaca_error.h>
+#include <yaca_key.h>
 
 #include "internal.h"
 

diff --git a/src/sign.c b/src/sign.c
index 4f749e8..bc9b137 100644 (file)
--- a/src/sign.c
+++ b/src/sign.c
@@ -28,10 +28,10 @@
 #include <openssl/rsa.h>
 #include <openssl/cmac.h>
 
-#include <yaca/crypto.h>
-#include <yaca/sign.h>
-#include <yaca/error.h>
-#include <yaca/key.h>
+#include <yaca_crypto.h>
+#include <yaca_sign.h>
+#include <yaca_error.h>
+#include <yaca_key.h>
 
 #include "internal.h"
 

diff --git a/src/simple.c b/src/simple.c
index 2597c02..04db0fa 100644 (file)
--- a/src/simple.c
+++ b/src/simple.c
@@ -24,12 +24,12 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <yaca/crypto.h>
-#include <yaca/error.h>
-#include <yaca/encrypt.h>
-#include <yaca/digest.h>
-#include <yaca/key.h>
-#include <yaca/sign.h>
+#include <yaca_crypto.h>
+#include <yaca_error.h>
+#include <yaca_encrypt.h>
+#include <yaca_digest.h>
+#include <yaca_key.h>
+#include <yaca_sign.h>
 
 #include "internal.h"
 

diff --git a/src/yaca.pc.in b/src/yaca.pc.in
index c33c857..fe501b1 100644 (file)
--- a/src/yaca.pc.in
+++ b/src/yaca.pc.in
@@ -9,4 +9,4 @@ Name: yaca
 Description: Yet Another Crypto API
 Version: @_LIB_VERSION_@
 Libs: -L${libdir} -l@PROJECT_NAME@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/yaca