Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/hash_md5prime.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/hash_md5prime.c (modified) (8 diffs)

branches/3.2/mindi-busybox/libbb/hash_md5prime.c

@@ -60 +60 @@
  *
  * Reintroduced the loop unrolling in md5_transform and added the
- * MD5_SIZE_VS_SPEED option for configurability.  Define below as:
+ * MD5_SMALL option for configurability.  Define below as:
  *       0    fully unrolled loops
  *       1    partially unrolled (4 ops per loop)
@@ -76 +76 @@
 
 /* 1: fastest, 3: smallest */
-#if CONFIG_MD5_SIZE_VS_SPEED < 1
-# define MD5_SIZE_VS_SPEED 1
-#elif CONFIG_MD5_SIZE_VS_SPEED > 3
-# define MD5_SIZE_VS_SPEED 3
+#if CONFIG_MD5_SMALL < 1
+# define MD5_SMALL 1
+#elif CONFIG_MD5_SMALL > 3
+# define MD5_SMALL 3
 #else
-# define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED
+# define MD5_SMALL CONFIG_MD5_SMALL
 #endif
 
@@ -153 +153 @@
 {
     uint32_t a, b, c, d, x[16];
-#if MD5_SIZE_VS_SPEED > 1
+#if MD5_SMALL > 1
     uint32_t temp;
     const unsigned char *ps;
@@ -163 +163 @@
         6, 10, 15, 21
     };
-#endif /* MD5_SIZE_VS_SPEED > 1 */
-
-#if MD5_SIZE_VS_SPEED > 0
+#endif /* MD5_SMALL > 1 */
+
+#if MD5_SMALL > 0
     const uint32_t *pc;
     const unsigned char *pp;
@@ -199 +199 @@
     };
 
-#endif /* MD5_SIZE_VS_SPEED > 0 */
+#endif /* MD5_SMALL > 0 */
 
     memcpy32_le2cpu(x, block, 64);
@@ -208 +208 @@
     d = state[3];
 
-#if MD5_SIZE_VS_SPEED > 2
+#if MD5_SMALL > 2
     pc = C;
     pp = P;
@@ -234 +234 @@
         a = d; d = c; c = b; b = temp;
     }
-#elif MD5_SIZE_VS_SPEED > 1
+#elif MD5_SMALL > 1
     pc = C;
     pp = P;
@@ -261 +261 @@
         temp = d; d = c; c = b; b = a; a = temp;
     }
-#elif MD5_SIZE_VS_SPEED > 0
+#elif MD5_SMALL > 0
     pc = C;
     pp = P;