remove unused macro in rc2_local.h and rc5_local.h

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20015)

diff --git a/crypto/rc2/rc2_local.h b/crypto/rc2/rc2_local.h
index 04479160263e19c61c910631ed7b2a258f3fba4f..2b8dccdc5d1db175cd8ff616a1c1a1d24d185571 100644 (file)
--- a/crypto/rc2/rc2_local.h
+++ b/crypto/rc2/rc2_local.h
@@ -66,69 +66,3 @@
                                 } \
                         }
 
-/* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                        /* fall through */                              \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-                                } \
-                        }
-
-/* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        /* fall through */                                    \
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        /* fall through */                                    \
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                        /* fall through */                                    \
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                                } \
-                        }
-
-#undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
-
-#undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
-
-#define C_RC2(n) \
-        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff; \
-        x0=(t<<1)|(t>>15); \
-        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff; \
-        x1=(t<<2)|(t>>14); \
-        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff; \
-        x2=(t<<3)|(t>>13); \
-        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff; \
-        x3=(t<<5)|(t>>11);

diff --git a/crypto/rc5/rc5_local.h b/crypto/rc5/rc5_local.h
index c027e4d1ed3e570addf2aeadabd23537c838a564..74d072a3797dfaf89152a6ce70b2dc8962c19c34 100644 (file)
--- a/crypto/rc5/rc5_local.h
+++ b/crypto/rc5/rc5_local.h
@@ -68,63 +68,6 @@
                                 } \
                         }
 
-/* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                        /* fall through */                              \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-                                } \
-                        }
-
-/* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        /* fall through */                                    \
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        /* fall through */                                    \
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                        /* fall through */                                    \
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                                } \
-                        }
-
-#undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
-
-#undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
-
 #if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
 # define ROTATE_l32(a,n)     _lrotl(a,n)
 # define ROTATE_r32(a,n)     _lrotr(a,n)
@@ -158,12 +101,8 @@
 
 #define RC5_32_MASK     0xffffffffL
 
-#define RC5_16_P        0xB7E1
-#define RC5_16_Q        0x9E37
 #define RC5_32_P        0xB7E15163L
 #define RC5_32_Q        0x9E3779B9L
-#define RC5_64_P        0xB7E151628AED2A6BLL
-#define RC5_64_Q        0x9E3779B97F4A7C15LL
 
 #define E_RC5_32(a,b,s,n) \
         a^=b; \