Initial fix for older Apple ld's non_lazy_ptr missing symbols (Issue 255)

1 files changed, 20 insertions, 17 deletions

diff --git a/panama.cpp b/panama.cpp
index 1631e02c..2c76c934 100644
--- a/panama.cpp
+++ b/panama.cpp
@@ -12,11 +12,14 @@
 #include "cpu.h"

 

 NAMESPACE_BEGIN(CryptoPP)

-	

+

 #if CRYPTOPP_MSC_VERSION

 # pragma warning(disable: 4731)

 #endif

 

+// Hack for OS X 10.5 ld, http://github.com/weidai11/cryptopp/issues/255

+static const size_t s_unused = PanamaCipher<>::KEYLENGTH;

+

 template <class B>

 void Panama<B>::Reset()

 {

@@ -385,22 +388,22 @@ void Panama<B>::Iterate(size_t count, const word32 *p, byte *output, const byte
 			UL(0); UL(1); UL(2); UL(3); UL(4); UL(5); UL(6); UL(7);

 		}

 

-		GP(0); 

-		GP(1); 

-		GP(2); 

-		GP(3); 

-		GP(4); 

-		GP(5); 

-		GP(6); 

+		GP(0);

+		GP(1);

+		GP(2);

+		GP(3);

+		GP(4);

+		GP(5);

+		GP(6);

 		GP(7);

-		GP(8); 

-		GP(9); 

-		GP(10); 

-		GP(11); 

-		GP(12); 

-		GP(13); 

-		GP(14); 

-		GP(15); 

+		GP(8);

+		GP(9);

+		GP(10);

+		GP(11);

+		GP(12);

+		GP(13);

+		GP(14);

+		GP(15);

 		GP(16);

 

 		T(0,1);

@@ -434,7 +437,7 @@ void PanamaHash<B>::TruncatedFinal(byte *hash, size_t size)
 	this->ThrowIfInvalidTruncatedSize(size);

 

 	this->PadLastBlock(this->BLOCKSIZE, 0x01);

-	

+

 	HashEndianCorrectedBlock(this->m_data);

 

 	this->Iterate(32);	// pull