commit 0fd0263e6b31af43a269d56b9dca58bd77091af4
author Jim Schaad <ietf@augustcellars.com> Wed Apr 29 15:01:12 2020 -0700
committer Jim Schaad <ietf@augustcellars.com> Wed Apr 29 16:14:10 2020 -0700
tree 5d0266a4beb5501d0fd42cf904ccb4c397676d1d
parent 0b9e7b539f196c92557b23c85c09c4d4fb154358

Rename crypto.h to cose_crypto.h

This is needed to make MBed-Studio happy because it does a really bad job of setting the include path

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08b3f71..c62cdfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,9 +36,8 @@
 set(cose_sources
     ${PROJECT_SOURCE_DIR}/include/cose/cose.h
     ${CMAKE_BINARY_DIR}/include/cose/cose_configure.h
-    crypto.h
+    cose_crypto.h
     cose_int.h
-    crypto.h
     Cose.c
     CounterSign.c
     CounterSign0.c

src/Cose.c

diff --git a/src/Cose.c b/src/Cose.c
index e5214eb..65e830c 100644
--- a/src/Cose.c
+++ b/src/Cose.c
@@ -6,7 +6,7 @@
 #include "cose/cose.h"
 #include "cose/cose_configure.h"
 #include "cose_int.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 bool IsValidCOSEHandle(HCOSE h)
 {

src/CounterSign.c

diff --git a/src/CounterSign.c b/src/CounterSign.c
index 7e54e0a..643b213 100644
--- a/src/CounterSign.c
+++ b/src/CounterSign.c
@@ -6,7 +6,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_COUNTERSIGNATURE
 

src/CounterSign0.c

diff --git a/src/CounterSign0.c b/src/CounterSign0.c
index dc9e4a2..479e435 100644
--- a/src/CounterSign0.c
+++ b/src/CounterSign0.c
@@ -6,7 +6,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if USE_COUNTER_SIGNATURE1
 

src/Encrypt.c

diff --git a/src/Encrypt.c b/src/Encrypt.c
index 221c870..9a58933 100644
--- a/src/Encrypt.c
+++ b/src/Encrypt.c
@@ -15,7 +15,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_ENCRYPT || INCLUDE_MAC
 COSE *EnvelopedRoot = NULL;

src/Encrypt0.c

diff --git a/src/Encrypt0.c b/src/Encrypt0.c
index 3d7227b..805c0d1 100644
--- a/src/Encrypt0.c
+++ b/src/Encrypt0.c
@@ -13,7 +13,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_ENCRYPT0 || INCLUDE_MAC0
 

src/MacMessage.c

diff --git a/src/MacMessage.c b/src/MacMessage.c
index 96ef06a..106cadf 100644
--- a/src/MacMessage.c
+++ b/src/MacMessage.c
@@ -13,7 +13,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_MAC
 

src/MacMessage0.c

diff --git a/src/MacMessage0.c b/src/MacMessage0.c
index ce6df54..5c66546 100644
--- a/src/MacMessage0.c
+++ b/src/MacMessage0.c
@@ -14,7 +14,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_MAC0
 

src/Recipient.c

diff --git a/src/Recipient.c b/src/Recipient.c
index ef48eaa..64c35ad 100644
--- a/src/Recipient.c
+++ b/src/Recipient.c
@@ -6,7 +6,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_ENCRYPT || INCLUDE_ENCRYPT0 || INCLUDE_MAC || INCLUDE_MAC0
 static bool BuildContextBytes(COSE *pcose,

src/Sign1.c

diff --git a/src/Sign1.c b/src/Sign1.c
index e5739c5..2a59346 100644
--- a/src/Sign1.c
+++ b/src/Sign1.c
@@ -8,7 +8,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_SIGN1
 

src/SignerInfo.c

diff --git a/src/SignerInfo.c b/src/SignerInfo.c
index 0fd4204..76b5728 100644
--- a/src/SignerInfo.c
+++ b/src/SignerInfo.c
@@ -11,7 +11,7 @@
 #include "cose/cose.h"
 #include "cose_int.h"
 #include "cose/cose_configure.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if INCLUDE_SIGN || INCLUDE_COUNTERSIGNATURE
 

src/bcrypt.c

diff --git a/src/bcrypt.c b/src/bcrypt.c
index a591b77..c8f8b55 100644
--- a/src/bcrypt.c
+++ b/src/bcrypt.c
@@ -1,7 +1,7 @@
 #include "cose/cose.h"
 #include "cose/cose_configure.h"
 #include "cose_int.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #if COSE_C_USE_BCRYPT
 
@@ -77,4 +77,4 @@
 	return true;
 }
 
-#endif	// COSE_C_USE_BCRYPT
\ No newline at end of file
+#endif	// COSE_C_USE_BCRYPT

src/cose_crypto.h

diff --git a/src/crypto.h b/src/cose_crypto.h
similarity index 100%
rename from src/crypto.h
rename to src/cose_crypto.h

src/mbedtls.c

diff --git a/src/mbedtls.c b/src/mbedtls.c
index 54236cc..8577dec 100644
--- a/src/mbedtls.c
+++ b/src/mbedtls.c
@@ -1,7 +1,7 @@
 #include "cose/cose.h"
 #include "cose/cose_configure.h"
 #include "cose_int.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #include <assert.h>
 #ifndef __MBED__

src/openssl.c

diff --git a/src/openssl.c b/src/openssl.c
index 2e66b00..b1ace50 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -1,7 +1,7 @@
 #include "cose/cose.h"
 #include "cose/cose_configure.h"
 #include "cose_int.h"
-#include "crypto.h"
+#include "cose_crypto.h"
 
 #include <assert.h>
 #include <memory.h>