[tor-commits] [stegotorus/master] kludge _another_ OSX issue

commit 4c7ad95c5fbc84a3b4b7ffaa5ff1c6dd90a85f53 Author: Zack Weinberg zackw@cmu.edu Date: Tue Mar 20 21:00:42 2012 -0700

kludge _another_ OSX issue --- src/crypt.cc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/crypt.cc b/src/crypt.cc index 402ae58..d6eed49 100644 --- a/src/crypt.cc +++ b/src/crypt.cc @@ -5,6 +5,11 @@ #include "util.h" #include "crypt.h"

+// temporary, I hope, kludge +#ifdef __APPLE_CC__ +#define CRYPTOPP_DISABLE_X86ASM +#endif + #include <cryptopp/aes.h> #include <cryptopp/hmac.h> #include <cryptopp/gcm.h> @@ -101,7 +106,6 @@ ecb_decryptor_impl::decrypt(uint8_t *out, const uint8_t *in) CATCH_ALL_EXCEPTIONS(); }

- namespace { struct gcm_encryptor_impl : gcm_encryptor {