[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  604c853d453282a3ef4d7d1ed8cbae57097c3813 (commit)
      from  a3004c820370b6bee82c919721fb1cbe95f72f3f (commit)


- Log -----------------------------------------------------------------
commit 604c853d453282a3ef4d7d1ed8cbae57097c3813
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Feb 28 22:54:28 2017 +0100

    des/des_locl.h: clean up unused/irrelevant macros.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/des/des_locl.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 53881d4..3c08ce8 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -26,10 +26,6 @@
 # define ITERATIONS 16
 # define HALF_ITERATIONS 8
 
-/* used in des_read and des_write */
-# define MAXWRITE        (1024*16)
-# define BSIZE           (MAXWRITE+4)
-
 # define c2l(c,l)        (l =((DES_LONG)(*((c)++)))    , \
                          l|=((DES_LONG)(*((c)++)))<< 8L, \
                          l|=((DES_LONG)(*((c)++)))<<16L, \
@@ -60,7 +56,6 @@
  * replacements for htonl and ntohl since I have no idea what to do when
  * faced with machines with 8 byte longs.
  */
-# define HDRSIZE 4
 
 # define n2l(c,l)        (l =((DES_LONG)(*((c)++)))<<24L, \
                          l|=((DES_LONG)(*((c)++)))<<16L, \
@@ -87,7 +82,7 @@
                                 } \
                         }
 
-# if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
+# if defined(_MSC_VER)
 #  define ROTATE(a,n)     (_lrotr(a,n))
 # elif defined(__ICC)
 #  define ROTATE(a,n)     (_rotr(a,n))