X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/59e0d9fe772464b93d835d2a2964457702469a43..refs/heads/master:/gen/crypt.c

diff --git a/gen/crypt.c b/gen/crypt.c
index a344d4c..ef2c601 100644
--- a/gen/crypt.c
+++ b/gen/crypt.c
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -58,19 +56,13 @@
  * SUCH DAMAGE.
  */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
 
-/*
- * PR-3509199
- *
- * encrypt() and setkey() should return void, but were returning int.  For
- * backwards compatibility, define __APPLE_PR_3509199_COMPAT__ to continue
- * to return int, even though unistd.h declares void.  We will need to not
- * include unistd.h so as to avoid the prototype mismatch.
- */
-#ifndef __APPLE_PR_3509199_COMPAT__
+#include <sys/cdefs.h>
 #include <unistd.h>
-#endif /* __APPLE_PR_3509199_COMPAT__ */
 #include <limits.h>
+#include <sys/types.h>
 #include <pwd.h>
 #include <stdlib.h>
 
@@ -95,7 +87,7 @@
 /*
  * define "MUST_ALIGN" if your compiler cannot load/store
  * long integers at arbitrary (e.g. odd) memory locations.
- * (Either that or never pass unaligned addresses to des_cipher!)
+ * (Either that or never pass unaligned addresses to __crypt_des_cipher!)
  */
 #if !defined(vax)
 #define	MUST_ALIGN
@@ -111,7 +103,7 @@
  * define "LONG_IS_32_BITS" only if sizeof(long)==4.
  * This avoids use of bit fields (your compiler may be sloppy with them).
  */
-#if !defined(cray)
+#if !defined(cray) && (LONG_BIT == 32)
 #define	LONG_IS_32_BITS
 #endif
 
@@ -128,7 +120,7 @@
 
 /*
  * define "LARGEDATA" to get faster permutations, by using about 72 kilobytes
- * of lookup tables.  This speeds up des_setkey() and des_cipher(), but has
+ * of lookup tables.  This speeds up __crypt_des_setkey() and __crypt_des_cipher(), but has
  * little effect on crypt().
  */
 #if defined(notdef)
@@ -139,11 +131,14 @@
 #ifndef STATIC
 #define	STATIC	static
 #endif
+#ifndef BUILDING_VARIANT
 STATIC void init_des(), init_perm(), permute();
-STATIC int des_cipher(), des_setkey();
 #ifdef DEBUG
-STATIC prtab();
+#include <stdio.h>
+STATIC void prtab();
 #endif
+#endif /* BUILDING_VARIANT */
+__private_extern__ int __crypt_des_cipher(), __crypt_des_setkey();
 
 /* ==================================== */
 
@@ -328,6 +323,7 @@ typedef union {
 #define	PERM3264(d,d0,d1,cpp,p)				\
 	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
 
+#ifndef BUILDING_VARIANT
 STATIC void permute(cp, out, p, chars_in)
 	unsigned char *cp;
 	C_block *out;
@@ -346,12 +342,19 @@ STATIC void permute(cp, out, p, chars_in)
 	} while (--chars_in > 0);
 	STORE(D,D0,D1,*out);
 }
+#endif /* BUILDING_VARIANT */
 #endif /* LARGEDATA */
 
+#ifndef BUILDING_VARIANT
+__private_extern__ int __crypt_des_setkey_called = 0;
+#else /* BUILDING_VARIANT */
+extern int __crypt_des_setkey_called;
+#endif /* BUILDING_VARIANT */
 
 /* =====  (mostly) Standard DES Tables ==================== */
 
-static unsigned char IP[] = {		/* initial permutation */
+#ifndef BUILDING_VARIANT
+static const 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,
@@ -364,7 +367,7 @@ static unsigned char IP[] = {		/* initial permutation */
 
 /* The final permutation is the inverse of IP - no table is necessary */
 
-static unsigned char ExpandTr[] = {	/* expansion operation */
+static const unsigned char ExpandTr[] = {	/* expansion operation */
 	32,  1,  2,  3,  4,  5,
 	 4,  5,  6,  7,  8,  9,
 	 8,  9, 10, 11, 12, 13,
@@ -375,7 +378,7 @@ static unsigned char ExpandTr[] = {	/* expansion operation */
 	28, 29, 30, 31, 32,  1,
 };
 
-static unsigned char PC1[] = {		/* permuted choice table 1 */
+static const 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,
@@ -387,12 +390,12 @@ static unsigned char PC1[] = {		/* permuted choice table 1 */
 	21, 13,  5, 28, 20, 12,  4,
 };
 
-static unsigned char Rotates[] = {	/* PC1 rotation schedule */
+static const 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 unsigned char PC2[] = {		/* permuted choice table 2 */
+static const 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,
@@ -455,7 +458,7 @@ static const unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
 	},
 };
 
-static unsigned char P32Tr[] = {	/* 32-bit permutation function */
+static const unsigned char P32Tr[] = {	/* 32-bit permutation function */
 	16,  7, 20, 21,
 	29, 12, 28, 17,
 	 1, 15, 23, 26,
@@ -466,7 +469,7 @@ static unsigned char P32Tr[] = {	/* 32-bit permutation function */
 	22, 11,  4, 25,
 };
 
-static unsigned char CIFP[] = {		/* compressed/interleaved permutation */
+static const 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,
@@ -478,14 +481,24 @@ static unsigned char CIFP[] = {		/* compressed/interleaved permutation */
 	45, 46, 47, 48,   61, 62, 63, 64,
 };
 
-static unsigned char itoa64[] =		/* 0..63 => ascii-64 */
+static const unsigned char itoa64[] =		/* 0..63 => ascii-64 */
 	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 
 /* =====  Tables that are initialized at run time  ==================== */
 
 
-static unsigned char a64toi[128];	/* ascii-64 => 0..63 */
+/* 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,
+};
 
 /* Initial key schedule permutation */
 // static C_block	PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];
@@ -535,7 +548,7 @@ crypt(key, setting)
 			key++;
 		keyblock.b[i] = t;
 	}
-	if (des_setkey((char *)keyblock.b))	/* also initializes "a64toi" */
+	if (__crypt_des_setkey((char *)keyblock.b))	/* also initializes "a64toi" */
 		return (NULL);
 
 	encp = &cryptresult[0];
@@ -545,7 +558,7 @@ crypt(key, setting)
 		 * Involve the rest of the password 8 characters at a time.
 		 */
 		while (*key) {
-			if (des_cipher((char *)&keyblock,
+			if (__crypt_des_cipher((char *)&keyblock,
 			    (char *)&keyblock, 0L, 1))
 				return (NULL);
 			for (i = 0; i < 8; i++) {
@@ -553,7 +566,7 @@ crypt(key, setting)
 					key++;
 				keyblock.b[i] ^= t;
 			}
-			if (des_setkey((char *)keyblock.b))
+			if (__crypt_des_setkey((char *)keyblock.b))
 				return (NULL);
 		}
 
@@ -584,7 +597,7 @@ crypt(key, setting)
 		salt = (salt<<6) | a64toi[t];
 	}
 	encp += salt_size;
-	if (des_cipher((char *)&constdatablock, (char *)&rsltblock,
+	if (__crypt_des_cipher((char *)&constdatablock, (char *)&rsltblock,
 	    salt, num_iter))
 		return (NULL);
 
@@ -613,7 +626,7 @@ crypt(key, setting)
 
 
 /*
- * The Key Schedule, filled in by des_setkey() or setkey().
+ * The Key Schedule, filled in by __crypt_des_setkey() or setkey().
  */
 #define	KS_SIZE	16
 static C_block	KS[KS_SIZE];
@@ -621,7 +634,7 @@ static C_block	KS[KS_SIZE];
 /*
  * Set up the key schedule from the key.
  */
-STATIC int des_setkey(key)
+__private_extern__ int __crypt_des_setkey(key)
 	register const char *key;
 {
 	register DCL_BLOCK(K, K0, K1);
@@ -644,6 +657,7 @@ STATIC int des_setkey(key)
 		PERM6464(K,K0,K1,(unsigned char *)key,ptabp);
 		STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
 	}
+	__crypt_des_setkey_called = 1;
 	return (0);
 }
 
@@ -655,7 +669,7 @@ STATIC int des_setkey(key)
  * NOTE: the performance of this routine is critically dependent on your
  * compiler and machine architecture.
  */
-STATIC int des_cipher(in, out, salt, num_iter)
+__private_extern__ int __crypt_des_cipher(in, out, salt, num_iter)
 	const char *in;
 	char *out;
 	long salt;
@@ -667,7 +681,8 @@ STATIC int des_cipher(in, out, salt, num_iter)
 #endif
 	register long L0, L1, R0, R1, k;
 	register C_block *kp;
-	register int ks_inc, loop_count;
+	register int loop_count;
+	ssize_t ks_inc;
 	C_block B;
 
 	L0 = salt;
@@ -780,19 +795,11 @@ STATIC void init_des()
 	register int i, j;
 	register long k;
 	register int tableno;
-	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;
+	unsigned char perm[64] = {0};
 
 	/*
 	 * 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;
@@ -889,6 +896,7 @@ STATIC void init_des()
 		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)|
@@ -900,8 +908,6 @@ STATIC void init_des()
 			    (((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;
@@ -943,15 +949,16 @@ STATIC void init_perm(perm, p, chars_in, chars_out)
 		}
 	}
 }
+#endif /* BUILDING_VARIANT */
 
 /*
  * "setkey" routine (for backwards compatibility)
  */
-#ifdef __APPLE_PR_3509199_COMPAT__
-int setkey(key)
-#else /* __APPLE_PR_3509199_COMPAT__ */
+#if __DARWIN_UNIX03
 void setkey(key)
-#endif /* __APPLE_PR_3509199_COMPAT__ */
+#else /* !__DARWIN_UNIX03 */
+int setkey(key)
+#endif /* __DARWIN_UNIX03 */
 	register const char *key;
 {
 	register int i, j, k;
@@ -965,27 +972,33 @@ void setkey(key)
 		}
 		keyblock.b[i] = k;
 	}
-#ifdef __APPLE_PR_3509199_COMPAT__
-	return (des_setkey((char *)keyblock.b));
-#else /* __APPLE_PR_3509199_COMPAT__ */
-	des_setkey((char *)keyblock.b);
-#endif /* __APPLE_PR_3509199_COMPAT__ */
+#if __DARWIN_UNIX03
+	__crypt_des_setkey((char *)keyblock.b);
+#else /* !__DARWIN_UNIX03 */
+	return (__crypt_des_setkey((char *)keyblock.b));
+#endif /* __DARWIN_UNIX03 */
 }
 
 /*
  * "encrypt" routine (for backwards compatibility)
  */
-#ifdef __APPLE_PR_3509199_COMPAT__
-int encrypt(block, flag)
-#else /* __APPLE_PR_3509199_COMPAT__ */
+#if __DARWIN_UNIX03
 void encrypt(block, flag)
-#endif /* __APPLE_PR_3509199_COMPAT__ */
+#else /* !__DARWIN_UNIX03 */
+int encrypt(block, flag)
+#endif /* __DARWIN_UNIX03 */
 	register char *block;
 	int flag;
 {
 	register int i, j, k;
 	C_block cblock;
 
+	/* Prevent encrypt from crashing if setkey was never called.
+	 * This does not make a good cypher */
+	if (!__crypt_des_setkey_called) {
+		cblock.b32.i0 = cblock.b32.i1 = 0;
+		__crypt_des_setkey((char *)cblock.b);
+	}
 	for (i = 0; i < 8; i++) {
 		k = 0;
 		for (j = 0; j < 8; j++) {
@@ -994,12 +1007,12 @@ void encrypt(block, flag)
 		}
 		cblock.b[i] = k;
 	}
-#ifdef __APPLE_PR_3509199_COMPAT__
-	if (des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1)))
+	if (__crypt_des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1)))
+#if __DARWIN_UNIX03
+		return;
+#else /* !__DARWIN_UNIX03 */
 		return (1);
-#else /* __APPLE_PR_3509199_COMPAT__ */
-	(void)des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1));
-#endif /* __APPLE_PR_3509199_COMPAT__ */
+#endif /* __DARWIN_UNIX03 */
 	for (i = 7; i >= 0; i--) {
 		k = cblock.b[i];
 		for (j = 7; j >= 0; j--) {
@@ -1007,13 +1020,14 @@ void encrypt(block, flag)
 			k >>= 1;
 		}
 	}
-#ifdef __APPLE_PR_3509199_COMPAT__
+#if !__DARWIN_UNIX03
 	return (0);
-#endif /* __APPLE_PR_3509199_COMPAT__ */
+#endif /* !__DARWIN_UNIX03 */
 }
 
+#ifndef BUILDING_VARIANT
 #ifdef DEBUG
-STATIC
+STATIC void
 prtab(s, t, num_rows)
 	char *s;
 	unsigned char *t;
@@ -1031,3 +1045,6 @@ prtab(s, t, num_rows)
 	(void)printf("\n");
 }
 #endif
+#endif /* BUILDING_VARIANT */
+
+#pragma clang diagnostic pop