Loading...
--- Libc/Libc-1725.40.4/gen/crypt.c
+++ Libc/Libc-583/gen/crypt.c
@@ -56,8 +56,6 @@
* SUCH DAMAGE.
*/
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wstrict-prototypes"
#include <sys/cdefs.h>
#include <unistd.h>
@@ -133,12 +131,11 @@
#endif
#ifndef BUILDING_VARIANT
STATIC void init_des(), init_perm(), permute();
-#ifdef DEBUG
-#include <stdio.h>
-STATIC void prtab();
-#endif
#endif /* BUILDING_VARIANT */
__private_extern__ int __crypt_des_cipher(), __crypt_des_setkey();
+#ifdef DEBUG
+STATIC prtab();
+#endif
/* ==================================== */
@@ -348,13 +345,13 @@
#ifndef BUILDING_VARIANT
__private_extern__ int __crypt_des_setkey_called = 0;
#else /* BUILDING_VARIANT */
-extern int __crypt_des_setkey_called;
+__private_extern__ int __crypt_des_setkey_called;
#endif /* BUILDING_VARIANT */
/* ===== (mostly) Standard DES Tables ==================== */
#ifndef BUILDING_VARIANT
-static const unsigned char IP[] = { /* initial permutation */
+static unsigned char IP[] = { /* initial permutation */
58, 50, 42, 34, 26, 18, 10, 2,
60, 52, 44, 36, 28, 20, 12, 4,
62, 54, 46, 38, 30, 22, 14, 6,
@@ -367,7 +364,7 @@
/* The final permutation is the inverse of IP - no table is necessary */
-static const unsigned char ExpandTr[] = { /* expansion operation */
+static unsigned char ExpandTr[] = { /* expansion operation */
32, 1, 2, 3, 4, 5,
4, 5, 6, 7, 8, 9,
8, 9, 10, 11, 12, 13,
@@ -378,7 +375,7 @@
28, 29, 30, 31, 32, 1,
};
-static const unsigned char PC1[] = { /* permuted choice table 1 */
+static unsigned char PC1[] = { /* permuted choice table 1 */
57, 49, 41, 33, 25, 17, 9,
1, 58, 50, 42, 34, 26, 18,
10, 2, 59, 51, 43, 35, 27,
@@ -390,12 +387,12 @@
21, 13, 5, 28, 20, 12, 4,
};
-static const unsigned char Rotates[] = { /* PC1 rotation schedule */
+static unsigned char Rotates[] = { /* PC1 rotation schedule */
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
};
/* note: each "row" of PC2 is left-padded with bits that make it invertible */
-static const unsigned char PC2[] = { /* permuted choice table 2 */
+static unsigned char PC2[] = { /* permuted choice table 2 */
9, 18, 14, 17, 11, 24, 1, 5,
22, 25, 3, 28, 15, 6, 21, 10,
35, 38, 23, 19, 12, 4, 26, 8,
@@ -458,7 +455,7 @@
},
};
-static const unsigned char P32Tr[] = { /* 32-bit permutation function */
+static unsigned char P32Tr[] = { /* 32-bit permutation function */
16, 7, 20, 21,
29, 12, 28, 17,
1, 15, 23, 26,
@@ -469,7 +466,7 @@
22, 11, 4, 25,
};
-static const unsigned char CIFP[] = { /* compressed/interleaved permutation */
+static unsigned char CIFP[] = { /* compressed/interleaved permutation */
1, 2, 3, 4, 17, 18, 19, 20,
5, 6, 7, 8, 21, 22, 23, 24,
9, 10, 11, 12, 25, 26, 27, 28,
@@ -481,24 +478,14 @@
45, 46, 47, 48, 61, 62, 63, 64,
};
-static const unsigned char itoa64[] = /* 0..63 => ascii-64 */
+static unsigned char itoa64[] = /* 0..63 => ascii-64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
/* ===== Tables that are initialized at run time ==================== */
-/* ascii-64 => 0..63 */
-static const unsigned char a64toi[128] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
- 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 0, 0, 0, 0, 0,
- 0, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 0, 0, 0, 0, 0,
-};
+static unsigned char a64toi[128]; /* ascii-64 => 0..63 */
/* Initial key schedule permutation */
// static C_block PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];
@@ -795,11 +782,19 @@
register int i, j;
register long k;
register int tableno;
- unsigned char perm[64] = {0};
+ static unsigned char perm[64], tmp32[32]; /* "static" for speed */
+
+ /*
+ * table that converts chars "./0-9A-Za-z"to integers 0-63.
+ */
+ for (i = 0; i < 64; i++)
+ a64toi[itoa64[i]] = i;
/*
* PC1ROT - bit reverse, then PC1, then Rotate, then PC2.
*/
+ for (i = 0; i < 64; i++)
+ perm[i] = 0;
for (i = 0; i < 64; i++) {
if ((k = PC2[i]) == 0)
continue;
@@ -896,7 +891,6 @@
perm[i] = P32Tr[ExpandTr[i]-1];
for (tableno = 0; tableno < 8; tableno++) {
for (j = 0; j < 64; j++) {
- unsigned char tmp32[32] = { 0 };
k = (((j >> 0) &01) << 5)|
(((j >> 1) &01) << 3)|
(((j >> 2) &01) << 2)|
@@ -908,6 +902,8 @@
(((k >> 2)&01) << 1)|
(((k >> 1)&01) << 2)|
(((k >> 0)&01) << 3);
+ for (i = 0; i < 32; i++)
+ tmp32[i] = 0;
for (i = 0; i < 4; i++)
tmp32[4 * tableno + i] = (k >> i) & 01;
k = 0;
@@ -1027,7 +1023,7 @@
#ifndef BUILDING_VARIANT
#ifdef DEBUG
-STATIC void
+STATIC
prtab(s, t, num_rows)
char *s;
unsigned char *t;
@@ -1046,5 +1042,3 @@
}
#endif
#endif /* BUILDING_VARIANT */
-
-#pragma clang diagnostic pop