refactor: move headers into namespace folder and add missing include guards
diff --git a/dumper/dumper.c b/dumper/dumper.c
index c46391f..908b968 100644
--- a/dumper/dumper.c
+++ b/dumper/dumper.c
@@ -1,7 +1,7 @@
#define _CRT_SECURE_NO_WARNINGS
#include <stdio.h>
-#include <cose.h>
+#include <cose/cose.h>
#include <sys/stat.h>
#include <cn-cbor/cn-cbor.h>
#include <fcntl.h>
diff --git a/include/configure.h b/include/cose/configure.h
similarity index 99%
rename from include/configure.h
rename to include/cose/configure.h
index b782466..978c36e 100644
--- a/include/configure.h
+++ b/include/cose/configure.h
@@ -2,6 +2,8 @@
// Determine which cryptographic library we are going to be using
//
+#pragma once
+
#if defined(USE_MBED_TLS)
#if defined(USE_OPEN_SSL) || defined(USE_BCRYPT)
#error Only Define One Crypto Package
diff --git a/include/cose.h b/include/cose/cose.h
similarity index 99%
rename from include/cose.h
rename to include/cose/cose.h
index 8150b12..32f4342 100644
--- a/include/cose.h
+++ b/include/cose/cose.h
@@ -1,5 +1,7 @@
#include <cn-cbor/cn-cbor.h>
-#include "configure.h"
+#include "cose/configure.h"
+
+#pragma once
#ifdef __cplusplus
extern "C" {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62e8b43..a15c473 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,18 +8,23 @@
set (cose_crypto openssl.c)
endif()
-set ( cose_sources
- Cose.c
- MacMessage.c
- MacMessage0.c
- Sign.c
- Sign1.c
- cbor.c
- Encrypt.c
- Encrypt0.c
- Recipient.c
- SignerInfo.c
- ${cose_crypto}
+set(cose_sources
+ ${CMAKE_CURRENT_LIST_DIR}/../include/cose/cose.h
+ ${CMAKE_CURRENT_LIST_DIR}/../include/cose/configure.h
+ crypto.h
+ cose_int.h
+ crypto.h
+ Cose.c
+ MacMessage.c
+ MacMessage0.c
+ Sign.c
+ Sign1.c
+ cbor.c
+ Encrypt.c
+ Encrypt0.c
+ Recipient.c
+ SignerInfo.c
+ ${cose_crypto}
)
diff --git a/src/Cose.c b/src/Cose.c
index 5982e60..0c7f0ed 100644
--- a/src/Cose.c
+++ b/src/Cose.c
@@ -3,9 +3,9 @@
#include <memory.h>
#endif
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
bool IsValidCOSEHandle(HCOSE h)
diff --git a/src/Encrypt.c b/src/Encrypt.c
index 5967245..30d9f8e 100644
--- a/src/Encrypt.c
+++ b/src/Encrypt.c
@@ -11,9 +11,9 @@
#include <stdio.h>
#include <assert.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_ENCRYPT || INCLUDE_MAC
diff --git a/src/Encrypt0.c b/src/Encrypt0.c
index 189bbc7..9cea4fc 100644
--- a/src/Encrypt0.c
+++ b/src/Encrypt0.c
@@ -9,9 +9,9 @@
#include <stdio.h>
#include <assert.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_ENCRYPT0 || INCLUDE_MAC0
diff --git a/src/MacMessage.c b/src/MacMessage.c
index 62be761..4a87d1a 100644
--- a/src/MacMessage.c
+++ b/src/MacMessage.c
@@ -10,9 +10,9 @@
#include <assert.h>
#include <string.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_MAC
diff --git a/src/MacMessage0.c b/src/MacMessage0.c
index 47ed015..bf10beb 100644
--- a/src/MacMessage0.c
+++ b/src/MacMessage0.c
@@ -10,9 +10,9 @@
#include <assert.h>
#include <string.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_MAC0
diff --git a/src/ReadMe.txt b/src/ReadMe.txt
deleted file mode 100644
index 9645755..0000000
--- a/src/ReadMe.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-========================================================================
- STATIC LIBRARY : C Project Overview
-========================================================================
-
-AppWizard has created this C library project for you.
-
-No source files were created as part of your project.
-
-
-C.vcxproj
- This is the main project file for VC++ projects generated using an Application Wizard.
- It contains information about the version of Visual C++ that generated the file, and
- information about the platforms, configurations, and project features selected with the
- Application Wizard.
-
-C.vcxproj.filters
- This is the filters file for VC++ projects generated using an Application Wizard.
- It contains information about the association between the files in your project
- and the filters. This association is used in the IDE to show grouping of files with
- similar extensions under a specific node (for e.g. ".cpp" files are associated with the
- "Source Files" filter).
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/Recipient.c b/src/Recipient.c
index 7ada624..f771674 100644
--- a/src/Recipient.c
+++ b/src/Recipient.c
@@ -3,9 +3,9 @@
#include <memory.h>
#endif
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_ENCRYPT || INCLUDE_ENCRYPT0 || INCLUDE_MAC || INCLUDE_MAC0
diff --git a/src/Sign.c b/src/Sign.c
index 59e2972..9723aa5 100644
--- a/src/Sign.c
+++ b/src/Sign.c
@@ -4,9 +4,9 @@
#include <stdlib.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#if INCLUDE_SIGN
diff --git a/src/Sign1.c b/src/Sign1.c
index 2c36c46..8a0b85f 100644
--- a/src/Sign1.c
+++ b/src/Sign1.c
@@ -4,9 +4,9 @@
#include <stdlib.h>
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_SIGN1
diff --git a/src/SignerInfo.c b/src/SignerInfo.c
index 0f7d7b3..27f17c8 100644
--- a/src/SignerInfo.c
+++ b/src/SignerInfo.c
@@ -7,9 +7,9 @@
#include <memory.h>
#endif
-#include "cose.h"
+#include "cose/cose.h"
#include "cose_int.h"
-#include "configure.h"
+#include "cose/configure.h"
#include "crypto.h"
#if INCLUDE_SIGN
diff --git a/src/bcrypt.c b/src/bcrypt.c
index 04907e8..dea7428 100644
--- a/src/bcrypt.c
+++ b/src/bcrypt.c
@@ -1,5 +1,5 @@
-#include "cose.h"
-#include "configure.h"
+#include "cose/cose.h"
+#include "cose/configure.h"
#include "cose_int.h"
#include "crypto.h"
diff --git a/src/cose_int.h b/src/cose_int.h
index 9debbc0..59e1757 100644
--- a/src/cose_int.h
+++ b/src/cose_int.h
@@ -1,5 +1,5 @@
-#ifndef __COSE_INT_H__
-#define __COSE_INT_H__
+#pragma once
+
#include <assert.h>
// These definitions are here because they aren't required for the public
@@ -283,4 +283,3 @@
#define COSE_CounterSign_object 1000
-#endif // __COSE_INT_H__
diff --git a/src/crypto.h b/src/crypto.h
index 894cb44..2caebf1 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -1,3 +1,5 @@
+#pragma once
+
/**
* Perform an AES-CCM Decryption operation
*
diff --git a/src/mbedtls.c b/src/mbedtls.c
index 07d7dae..c3a11f3 100644
--- a/src/mbedtls.c
+++ b/src/mbedtls.c
@@ -1,5 +1,5 @@
-#include "cose.h"
-#include "configure.h"
+#include "cose/cose.h"
+#include "cose/configure.h"
#include "cose_int.h"
#include "crypto.h"
@@ -1097,7 +1097,7 @@
/*
//#include <stdio.h> //TODO
void rand_bytes(byte * pb, size_t cb){
-//ctx->aes_ctx->rk e null... i callchainen längst in. prova istället:
+//ctx->aes_ctx->rk e null... i callchainen l�ngst in. prova ist�llet:
//kolla https://tls.mbed.org/kb/how-to/add-a-random-generator
//init random
mbedtls_ctr_drbg_context ctr_drbg;
diff --git a/src/openssl.c b/src/openssl.c
index 4907996..e64330f 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -1,5 +1,5 @@
-#include "cose.h"
-#include "configure.h"
+#include "cose/cose.h"
+#include "cose/configure.h"
#include "cose_int.h"
#include "crypto.h"
diff --git a/test/encrypt.c b/test/encrypt.c
index 300f33e..ffb3f9c 100644
--- a/test/encrypt.c
+++ b/test/encrypt.c
@@ -5,8 +5,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cose.h>
-#include <configure.h>
+#include <cose/cose.h>
+#include <cose/configure.h>
#include <cn-cbor/cn-cbor.h>
#if (INCLUDE_ENCRYPT || INCLUDE_ENCRYPT0 || INCLUDE_MAC) && (!INCLUDE_MAC || !INCLUDE_SIGN)
#include <cose_int.h>
diff --git a/test/mac_test.c b/test/mac_test.c
index 150b8fd..f6bace7 100644
--- a/test/mac_test.c
+++ b/test/mac_test.c
@@ -3,8 +3,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cose.h>
-#include <configure.h>
+#include <cose/cose.h>
+#include <cose/configure.h>
#include <cn-cbor/cn-cbor.h>
#if INCLUDE_MAC && !INCLUDE_ENCRYPT0
#include <cose_int.h>
diff --git a/test/sign.c b/test/sign.c
index 73af7c5..24f1c13 100644
--- a/test/sign.c
+++ b/test/sign.c
@@ -5,8 +5,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cose.h>
-#include <configure.h>
+#include <cose/cose.h>
+#include <cose/configure.h>
#include <cn-cbor/cn-cbor.h>
#if (INCLUDE_SIGN && !(INCLUDE_SIGN1 || INCLUDE_ENCRYPT || INCLUDE_MAC)) || (INCLUDE_SIGN1 && !INCLUDE_SIGN)
#include <cose_int.h>
diff --git a/test/test.c b/test/test.c
index dd6d99a..5ea394c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -6,8 +6,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cose.h>
-#include <configure.h>
+#include <cose/cose.h>
+#include <cose/configure.h>
#include <cn-cbor/cn-cbor.h>
#include <assert.h>
