fix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678)

diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index e718b1f2f278d9f8cc7adfd7693021724524c6ac..96ab96a27ed662fd9d39ee8ec820ca98178547e3 100644 (file)
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 struct Crypto1State {uint32_t odd, even;};
 #endif
 
 struct Crypto1State {uint32_t odd, even;};

-#if defined(__arm__)
+#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__)         // bare metal ARM Proxmark lacks malloc()/free()

 void crypto1_create(struct Crypto1State *s, uint64_t key);
 #else
 struct Crypto1State *crypto1_create(uint64_t key);
 void crypto1_create(struct Crypto1State *s, uint64_t key);
 #else
 struct Crypto1State *crypto1_create(uint64_t key);

diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index a3f64a9f36a4fec38922f59cf76d63869a752529..61f6fe662639c6b64247da0a48adc22d8ba1efd9 100644 (file)
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -23,7 +23,7 @@
 #define SWAPENDIAN(x)\
        (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 
 #define SWAPENDIAN(x)\
        (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
 

-#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32)                        // bare metal ARM lacks malloc()/free()
+#if defined(__arm__) && !defined(__linux__) && !defined(_WIN32) && !defined(__APPLE__)         // bare metal ARM Proxmark lacks malloc()/free()

 void crypto1_create(struct Crypto1State *s, uint64_t key)
 {
        int i;
 void crypto1_create(struct Crypto1State *s, uint64_t key)
 {
        int i;