move configure.h to include/ (issue #63) (#64)
* move configure.h to include/ (issue #63)
* remove configure.h from cose.h
* fixbug: includes configure.h in tests
diff --git a/src/configure.h b/include/configure.h
similarity index 100%
rename from src/configure.h
rename to include/configure.h
diff --git a/include/cose.h b/include/cose.h
index 0b2ef02..85e70e0 100644
--- a/include/cose.h
+++ b/include/cose.h
@@ -1,10 +1,9 @@
#include <cn-cbor/cn-cbor.h>
-#include "configure.h"
#ifdef __cplusplus
extern "C" {
#endif
-
+
typedef unsigned char byte;
typedef struct _cose * HCOSE;
diff --git a/src/Sign.c b/src/Sign.c
index 7cd3f8a..59e2972 100644
--- a/src/Sign.c
+++ b/src/Sign.c
@@ -6,6 +6,7 @@
#include "cose.h"
#include "cose_int.h"
+#include "configure.h"
#if INCLUDE_SIGN
diff --git a/src/Sign0.c b/src/Sign0.c
index 0df4207..73b8e1e 100644
--- a/src/Sign0.c
+++ b/src/Sign0.c
@@ -6,6 +6,7 @@
#include "cose.h"
#include "cose_int.h"
+#include "configure.h"
#include "crypto.h"
#if INCLUDE_SIGN0
diff --git a/test/encrypt.c b/test/encrypt.c
index 20c9a3e..0fb56c8 100644
--- a/test/encrypt.c
+++ b/test/encrypt.c
@@ -6,6 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <cose.h>
+#include <configure.h>
#include <cn-cbor/cn-cbor.h>
#if (INCLUDE_ENCRYPT || INCLUDE_ENCRYPT0 || INCLUDE_MAC) && (!INCLUDE_MAC || !INCLUDE_SIGN)
#include <cose_int.h>
@@ -331,7 +332,7 @@
int typ;
hEncObj = (HCOSE_ENVELOPED) COSE_Decode(rgb, (int) cb, &typ, COSE_enveloped_object, CBOR_CONTEXT_PARAM_COMMA NULL);
if (hEncObj == NULL) goto errorReturn;
-
+
int iRecipient = 0;
do {
hRecip = COSE_Enveloped_GetRecipient(hEncObj, iRecipient, NULL);
diff --git a/test/mac_test.c b/test/mac_test.c
index 38aca75..150b8fd 100644
--- a/test/mac_test.c
+++ b/test/mac_test.c
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <cose.h>
+#include <configure.h>
#include <cn-cbor/cn-cbor.h>
#if INCLUDE_MAC && !INCLUDE_ENCRYPT0
#include <cose_int.h>
@@ -422,7 +423,7 @@
// Missing case - addref then release on item
// Incorrect algorithm
-
+
hMAC = (HCOSE_MAC) COSE_Mac_Init(0, CBOR_CONTEXT_PARAM_COMMA NULL);
// Invalid Handle checks
diff --git a/test/sign.c b/test/sign.c
index 0fdcb33..6231526 100644
--- a/test/sign.c
+++ b/test/sign.c
@@ -6,6 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <cose.h>
+#include <configure.h>
#include <cn-cbor/cn-cbor.h>
#if (INCLUDE_SIGN && !(INCLUDE_SIGN0 || INCLUDE_ENCRYPT || INCLUDE_MAC)) || (INCLUDE_SIGN0 && !INCLUDE_SIGN)
#include <cose_int.h>
@@ -189,7 +190,7 @@
byte rgbY[] = { 0x1e, 0x52, 0xed, 0x75, 0x70, 0x11, 0x63, 0xf7, 0xf9, 0xe4, 0x0d, 0xdf, 0x9f, 0x34, 0x1b, 0x3d, 0xc9, 0xba, 0x86, 0x0a, 0xf7, 0xe0, 0xca, 0x7c, 0xa7, 0xe9, 0xee, 0xcd, 0x00, 0x84, 0xd1, 0x9c };
byte kid[] = { 0x6d, 0x65, 0x72, 0x69, 0x61, 0x64, 0x6f, 0x63, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x79, 0x62, 0x75, 0x63, 0x6, 0xb4, 0x06, 0x27, 0x56, 0x36, 0xb6, 0xc6, 0x16, 0xe6, 0x42, 0xe6, 0x57, 0x86, 0x16, 0xd7, 0x06, 0x65};
byte rgbD[] = {0xaf, 0xf9, 0x07, 0xc9, 0x9f, 0x9a, 0xd3, 0xaa, 0xe6, 0xc4, 0xcd, 0xf2, 0x11, 0x22, 0xbc, 0xe2, 0xbd, 0x68, 0xb5, 0x28, 0x3e, 0x69, 0x07, 0x15, 0x4a, 0xd9, 0x11, 0x84, 0x0f, 0xa2, 0x08, 0xcf};
-
+
cn_cbor * pkey = cn_cbor_map_create(CBOR_CONTEXT_PARAM_COMMA NULL);
cn_cbor_mapput_int(pkey, COSE_Key_Type, cn_cbor_int_create(COSE_Key_Type_EC2, CBOR_CONTEXT_PARAM_COMMA NULL), CBOR_CONTEXT_PARAM_COMMA NULL);
cn_cbor_mapput_int(pkey, -1, cn_cbor_int_create(1, CBOR_CONTEXT_PARAM_COMMA NULL), CBOR_CONTEXT_PARAM_COMMA NULL);
diff --git a/test/test.c b/test/test.c
index 17c8e53..1fbc21f 100644
--- a/test/test.c
+++ b/test/test.c
@@ -7,6 +7,7 @@
#include <stdlib.h>
#include <string.h>
#include <cose.h>
+#include <configure.h>
#include <cn-cbor/cn-cbor.h>
#include <assert.h>
@@ -62,7 +63,7 @@
{"ECDH-ES", COSE_Algorithm_ECDH_ES_HKDF_256},
{"ECDH-ES-512",COSE_Algorithm_ECDH_ES_HKDF_512},
{ "ECDH-SS", COSE_Algorithm_ECDH_SS_HKDF_256 },
-{ "ECDH-SS-256", COSE_Algorithm_ECDH_SS_HKDF_256},
+{ "ECDH-SS-256", COSE_Algorithm_ECDH_SS_HKDF_256},
{ "ECDH-SS-512",COSE_Algorithm_ECDH_SS_HKDF_512 },
{ "ECDH-ES+A128KW", COSE_Algorithm_ECDH_ES_A128KW },
{ "ECDH-ES+A192KW", COSE_Algorithm_ECDH_ES_A192KW },
