From 9e4352c496771beda72dad169d39dbb97ddba33e Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Mon, 4 Apr 2016 11:08:53 +0200 Subject: [PATCH] Rename 'crypto' to 'owl' in include directives Change-Id: Ia568b1f875eee4059cfb9cf3c9342c1d04515ca0 --- api/{crypto => owl}/crypto.h | 2 +- api/{crypto => owl}/digest.h | 2 +- api/{crypto => owl}/encrypt.h | 2 +- api/{crypto => owl}/error.h | 0 api/{crypto => owl}/key.h | 2 +- api/{crypto => owl}/sign.h | 2 +- api/{crypto => owl}/simple.h | 2 +- api/{crypto => owl}/types.h | 0 examples/digest.c | 6 +++--- examples/encrypt.c | 8 ++++---- examples/encrypt_aes_gcm.c | 8 ++++---- examples/key_exchange.c | 8 ++++---- examples/sign.c | 6 +++--- examples/test.c | 6 +++--- src/CMakeLists.txt | 2 +- src/crypto.c | 4 ++-- src/ctx_p.h | 2 +- src/digest.c | 6 +++--- src/encrypt.c | 4 ++-- src/key.c | 6 +++--- src/key_p.h | 2 +- src/sign.c | 4 ++-- src/simple.c | 10 +++++----- 23 files changed, 47 insertions(+), 47 deletions(-) rename api/{crypto => owl}/crypto.h (99%) rename api/{crypto => owl}/digest.h (98%) rename api/{crypto => owl}/encrypt.h (99%) rename api/{crypto => owl}/error.h (100%) rename api/{crypto => owl}/key.h (99%) rename api/{crypto => owl}/sign.h (99%) rename api/{crypto => owl}/simple.h (99%) rename api/{crypto => owl}/types.h (100%) diff --git a/api/crypto/crypto.h b/api/owl/crypto.h similarity index 99% rename from api/crypto/crypto.h rename to api/owl/crypto.h index 32f88b4..2b6d62c 100644 --- a/api/crypto/crypto.h +++ b/api/owl/crypto.h @@ -25,7 +25,7 @@ #define CRYPTO_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/digest.h b/api/owl/digest.h similarity index 98% rename from api/crypto/digest.h rename to api/owl/digest.h index a8507e7..f6f2d22 100644 --- a/api/crypto/digest.h +++ b/api/owl/digest.h @@ -25,7 +25,7 @@ #define DIGEST_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/encrypt.h b/api/owl/encrypt.h similarity index 99% rename from api/crypto/encrypt.h rename to api/owl/encrypt.h index 6a38d00..2b6b67d 100644 --- a/api/crypto/encrypt.h +++ b/api/owl/encrypt.h @@ -25,7 +25,7 @@ #define ENCRYPT_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/error.h b/api/owl/error.h similarity index 100% rename from api/crypto/error.h rename to api/owl/error.h diff --git a/api/crypto/key.h b/api/owl/key.h similarity index 99% rename from api/crypto/key.h rename to api/owl/key.h index 1fa6228..5dea255 100644 --- a/api/crypto/key.h +++ b/api/owl/key.h @@ -25,7 +25,7 @@ #define KEY_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/sign.h b/api/owl/sign.h similarity index 99% rename from api/crypto/sign.h rename to api/owl/sign.h index 499a8dd..4ee5c1d 100644 --- a/api/crypto/sign.h +++ b/api/owl/sign.h @@ -25,7 +25,7 @@ #define SIGN_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/simple.h b/api/owl/simple.h similarity index 99% rename from api/crypto/simple.h rename to api/owl/simple.h index f6cff7b..cf51f22 100644 --- a/api/crypto/simple.h +++ b/api/owl/simple.h @@ -25,7 +25,7 @@ #define SIMPLE_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/api/crypto/types.h b/api/owl/types.h similarity index 100% rename from api/crypto/types.h rename to api/owl/types.h diff --git a/examples/digest.c b/examples/digest.c index 71d2d8d..a471e35 100644 --- a/examples/digest.c +++ b/examples/digest.c @@ -22,9 +22,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "lorem.h" #include "misc.h" diff --git a/examples/encrypt.c b/examples/encrypt.c index f0cbc49..208ddd7 100644 --- a/examples/encrypt.c +++ b/examples/encrypt.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "lorem.h" #include "misc.h" diff --git a/examples/encrypt_aes_gcm.c b/examples/encrypt_aes_gcm.c index f030ee5..acd218b 100644 --- a/examples/encrypt_aes_gcm.c +++ b/examples/encrypt_aes_gcm.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "lorem.h" #include "misc.h" diff --git a/examples/key_exchange.c b/examples/key_exchange.c index 80a1b44..59cbe3c 100644 --- a/examples/key_exchange.c +++ b/examples/key_exchange.c @@ -22,10 +22,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include void key_exchange_dh(void) { diff --git a/examples/sign.c b/examples/sign.c index 9927d9e..4438166 100644 --- a/examples/sign.c +++ b/examples/sign.c @@ -22,9 +22,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "misc.h" size_t IDX = 0; diff --git a/examples/test.c b/examples/test.c index 1a1b2a3..de46c95 100644 --- a/examples/test.c +++ b/examples/test.c @@ -17,9 +17,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "misc.h" /** Simple test for development of library (before API is ready) */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce8dfd8..014d756 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ PROJECT(owl) MESSAGE(STATUS "") MESSAGE(STATUS "Generating makefile for the owl...") -FILE(GLOB HEADERS ${API_FOLDER}/crypto/*.h) +FILE(GLOB HEADERS ${API_FOLDER}/owl/*.h) FILE(GLOB SRCS *.c *.h) SET(_LIB_VERSION_ "${VERSION}") diff --git a/src/crypto.c b/src/crypto.c index f9c1e52..74193da 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "ctx_p.h" diff --git a/src/ctx_p.h b/src/ctx_p.h index 268e847..b471d67 100644 --- a/src/ctx_p.h +++ b/src/ctx_p.h @@ -20,7 +20,7 @@ #define CTX_P_H #include -#include +#include enum owl_ctx_type_e { diff --git a/src/digest.c b/src/digest.c index 7eea51c..3d63cba 100644 --- a/src/digest.c +++ b/src/digest.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "ctx_p.h" diff --git a/src/encrypt.c b/src/encrypt.c index 319e2c6..88d140f 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include API int owl_encrypt_init(owl_ctx_h *ctx, owl_enc_algo_e algo, diff --git a/src/key.c b/src/key.c index 3e66514..080c427 100644 --- a/src/key.c +++ b/src/key.c @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "key_p.h" diff --git a/src/key_p.h b/src/key_p.h index 1d7cd6c..d8251e9 100644 --- a/src/key_p.h +++ b/src/key_p.h @@ -20,7 +20,7 @@ #define KEY_P_H #include -#include +#include /** * @file key_p.h diff --git a/src/sign.c b/src/sign.c index afca836..8c82103 100644 --- a/src/sign.c +++ b/src/sign.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include API int owl_sign_init(owl_ctx_h *ctx, owl_digest_algo_e algo, diff --git a/src/simple.c b/src/simple.c index 872cac0..250c5b9 100644 --- a/src/simple.c +++ b/src/simple.c @@ -24,11 +24,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include API int owl_digest_calc(owl_digest_algo_e algo, const char *data, -- 2.7.4