Remove 64-bit AdvancedProcessBlocks (GH #945)

1 files changed, 0 insertions, 18 deletions

diff --git a/speck.h b/speck.h
index 4a06729d..a08bc9c8 100644
--- a/speck.h
+++ b/speck.h
@@ -21,14 +21,6 @@
     CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARMV8 || \

     CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64

 # ifndef CRYPTOPP_DISABLE_SPECK_SIMD

-#  define CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS 1

-# endif

-#endif

-

-#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86 || \

-    CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARMV8 || \

-    CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64

-# ifndef CRYPTOPP_DISABLE_SPECK_SIMD

 #  define CRYPTOPP_SPECK128_ADVANCED_PROCESS_BLOCKS 1

 # endif

 #endif

@@ -36,13 +28,9 @@
 // Yet another SunStudio/SunCC workaround. Failed self tests

 // in SSE code paths on i386 for SunStudio 12.3 and below.

 #if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5120)

-# undef CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS

 # undef CRYPTOPP_SPECK128_ADVANCED_PROCESS_BLOCKS

 #endif

 

-// https://github.com/weidai11/cryptopp/issues/945

-#undef CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS

-

 NAMESPACE_BEGIN(CryptoPP)

 

 /// \brief SPECK block cipher information

@@ -129,9 +117,6 @@ public:
     {

     public:

         void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

-#if CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS

-        size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;

-#endif

     };

 

     /// \brief SPECK64 decryption transformation

@@ -142,9 +127,6 @@ public:
     {

     public:

         void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

-#if CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS

-        size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;

-#endif

     };

 

     typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;