Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / crypt.c

diff --git a/gen/crypt.c b/gen/crypt.c
index 2f569539c0cc029ddd70d66af9a46cc68420959c..ef2c601f7484faf9afcc8a265fc1ba0fdf5e0624 100644 (file)
--- a/gen/crypt.c
+++ b/gen/crypt.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -55,9 +56,13 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"

 
 

+#include <sys/cdefs.h>

 #include <unistd.h>
 #include <limits.h>
 #include <unistd.h>
 #include <limits.h>

+#include <sys/types.h>

 #include <pwd.h>
 #include <stdlib.h>
 
 #include <pwd.h>
 #include <stdlib.h>
 


@@ -82,7 +87,7 @@
 /*
  * define "MUST_ALIGN" if your compiler cannot load/store
  * long integers at arbitrary (e.g. odd) memory locations.
 /*
  * 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
  */
 #if !defined(vax)
 #define        MUST_ALIGN


@@ -98,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).
  */
  * 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
 
 #define        LONG_IS_32_BITS
 #endif
 


@@ -115,7 +120,7 @@
 
 /*
  * define "LARGEDATA" to get faster permutations, by using about 72 kilobytes
 
 /*
  * 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)
  * little effect on crypt().
  */
 #if defined(notdef)


@@ -126,10 +131,14 @@
 #ifndef STATIC
 #define        STATIC  static
 #endif
 #ifndef STATIC
 #define        STATIC  static
 #endif

+#ifndef BUILDING_VARIANT

 STATIC void init_des(), init_perm(), permute();
 #ifdef DEBUG
 STATIC void init_des(), init_perm(), permute();
 #ifdef DEBUG

-STATIC prtab();
+#include <stdio.h>
+STATIC void prtab();

 #endif
 #endif

+#endif /* BUILDING_VARIANT */
+__private_extern__ int __crypt_des_cipher(), __crypt_des_setkey();

 
 /* ==================================== */
 
 
 /* ==================================== */
 


@@ -314,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); }
 
 #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;
 STATIC void permute(cp, out, p, chars_in)
        unsigned char *cp;
        C_block *out;


@@ -332,12 +342,19 @@ STATIC void permute(cp, out, p, chars_in)
        } while (--chars_in > 0);
        STORE(D,D0,D1,*out);
 }
        } while (--chars_in > 0);
        STORE(D,D0,D1,*out);
 }

+#endif /* BUILDING_VARIANT */

 #endif /* LARGEDATA */
 
 #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 ==================== */
 
 
 /* =====  (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,
        58, 50, 42, 34, 26, 18, 10,  2,
        60, 52, 44, 36, 28, 20, 12,  4,
        62, 54, 46, 38, 30, 22, 14,  6,


@@ -350,7 +367,7 @@ static unsigned char IP[] = {               /* initial permutation */
 
 /* The final permutation is the inverse of IP - no table is necessary */
 
 
 /* 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,
        32,  1,  2,  3,  4,  5,
         4,  5,  6,  7,  8,  9,
         8,  9, 10, 11, 12, 13,


@@ -361,7 +378,7 @@ static unsigned char ExpandTr[] = { /* expansion operation */
        28, 29, 30, 31, 32,  1,
 };
 
        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,
        57, 49, 41, 33, 25, 17,  9,
         1, 58, 50, 42, 34, 26, 18,
        10,  2, 59, 51, 43, 35, 27,


@@ -373,12 +390,12 @@ static unsigned char PC1[] = {            /* permuted choice table 1 */
        21, 13,  5, 28, 20, 12,  4,
 };
 
        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 */
        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,
         9, 18,    14, 17, 11, 24,  1,  5,
        22, 25,     3, 28, 15,  6, 21, 10,
        35, 38,    23, 19, 12,  4, 26,  8,


@@ -391,49 +408,57 @@ static unsigned char PC2[] = {            /* permuted choice table 2 */
 };
 
 static const unsigned char S[8][64] = {        /* 48->32 bit substitution tables */
 };
 
 static const unsigned char S[8][64] = {        /* 48->32 bit substitution tables */

-                                       /* S[1]                 */
+       {                               /* S[1]                 */

        14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
         0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
         4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
        15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
        14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
         0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
         4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
        15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,

-                                       /* S[2]                 */
+       },
+       {                               /* S[2]                 */

        15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
         3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
         0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
        13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
        15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
         3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
         0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
        13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,

-                                       /* S[3]                 */
+       },
+       {                               /* S[3]                 */

        10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
        13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
        13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
         1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
        10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
        13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
        13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
         1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,

-                                       /* S[4]                 */
+       },
+       {                               /* S[4]                 */

         7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
        13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
        10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
         3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
         7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
        13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
        10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
         3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,

-                                       /* S[5]                 */
+       },
+       {                               /* S[5]                 */

         2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
        14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
         4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
        11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
         2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
        14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
         4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
        11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,

-                                       /* S[6]                 */
+       },
+       {                               /* S[6]                 */

        12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
        10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
         9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
         4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
        12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
        10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
         9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
         4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,

-                                       /* S[7]                 */
+       },
+       {                               /* S[7]                 */

         4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
        13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
         1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
         6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
         4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
        13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
         1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
         6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,

-                                       /* S[8]                 */
+       },
+       {                               /* S[8]                 */

        13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
         1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
         7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
         2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
        13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
         1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
         7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
         2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,

+       },

 };
 
 };
 

-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,
        16,  7, 20, 21,
        29, 12, 28, 17,
         1, 15, 23, 26,


@@ -444,7 +469,7 @@ static unsigned char P32Tr[] = {    /* 32-bit permutation function */
        22, 11,  4, 25,
 };
 
        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,
         1,  2,  3,  4,   17, 18, 19, 20,
         5,  6,  7,  8,   21, 22, 23, 24,
         9, 10, 11, 12,   25, 26, 27, 28,


@@ -456,14 +481,24 @@ static unsigned char CIFP[] = {           /* compressed/interleaved permutation */
        45, 46, 47, 48,   61, 62, 63, 64,
 };
 
        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  ==================== */
 
 
        "./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];
 
 /* Initial key schedule permutation */
 // static C_block      PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];


@@ -513,7 +548,7 @@ crypt(key, setting)
                        key++;
                keyblock.b[i] = t;
        }
                        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];
                return (NULL);
 
        encp = &cryptresult[0];


@@ -523,7 +558,7 @@ crypt(key, setting)
                 * Involve the rest of the password 8 characters at a time.
                 */
                while (*key) {
                 * 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++) {
                            (char *)&keyblock, 0L, 1))
                                return (NULL);
                        for (i = 0; i < 8; i++) {


@@ -531,7 +566,7 @@ crypt(key, setting)
                                        key++;
                                keyblock.b[i] ^= t;
                        }
                                        key++;
                                keyblock.b[i] ^= t;
                        }

-                       if (des_setkey((char *)keyblock.b))
+                       if (__crypt_des_setkey((char *)keyblock.b))

                                return (NULL);
                }
 
                                return (NULL);
                }
 


@@ -562,7 +597,7 @@ crypt(key, setting)
                salt = (salt<<6) | a64toi[t];
        }
        encp += salt_size;
                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);
 
            salt, num_iter))
                return (NULL);
 


@@ -591,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];
  */
 #define        KS_SIZE 16
 static C_block KS[KS_SIZE];


@@ -599,7 +634,7 @@ static C_block      KS[KS_SIZE];
 /*
  * Set up the key schedule from the key.
  */
 /*
  * 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);
        register const char *key;
 {
        register DCL_BLOCK(K, K0, K1);


@@ -622,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);
        }
                PERM6464(K,K0,K1,(unsigned char *)key,ptabp);
                STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
        }

+       __crypt_des_setkey_called = 1;

        return (0);
 }
 
        return (0);
 }
 


@@ -633,7 +669,7 @@ STATIC int des_setkey(key)
  * NOTE: the performance of this routine is critically dependent on your
  * compiler and machine architecture.
  */
  * 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;
        const char *in;
        char *out;
        long salt;


@@ -645,7 +681,8 @@ STATIC int des_cipher(in, out, salt, num_iter)
 #endif
        register long L0, L1, R0, R1, k;
        register C_block *kp;
 #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;
        C_block B;
 
        L0 = salt;


@@ -758,19 +795,11 @@ STATIC void init_des()
        register int i, j;
        register long k;
        register int tableno;
        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.
         */
 
        /*
         * 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;
        for (i = 0; i < 64; i++) {
                if ((k = PC2[i]) == 0)
                        continue;


@@ -867,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++)  {
                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)|
                        k = (((j >> 0) &01) << 5)|
                            (((j >> 1) &01) << 3)|
                            (((j >> 2) &01) << 2)|


@@ -878,8 +908,6 @@ STATIC void init_des()
                            (((k >> 2)&01) << 1)|
                            (((k >> 1)&01) << 2)|
                            (((k >> 0)&01) << 3);
                            (((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;
                        for (i = 0; i < 4; i++)
                                tmp32[4 * tableno + i] = (k >> i) & 01;
                        k = 0;


@@ -921,11 +949,16 @@ STATIC void init_perm(perm, p, chars_in, chars_out)
                }
        }
 }
                }
        }
 }

+#endif /* BUILDING_VARIANT */

 
 /*
  * "setkey" routine (for backwards compatibility)
  */
 
 /*
  * "setkey" routine (for backwards compatibility)
  */

+#if __DARWIN_UNIX03
+void setkey(key)
+#else /* !__DARWIN_UNIX03 */

 int setkey(key)
 int setkey(key)

+#endif /* __DARWIN_UNIX03 */

        register const char *key;
 {
        register int i, j, k;
        register const char *key;
 {
        register int i, j, k;


@@ -939,19 +972,33 @@ int setkey(key)
                }
                keyblock.b[i] = k;
        }
                }
                keyblock.b[i] = k;
        }

-       return (des_setkey((char *)keyblock.b));
+#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)
  */
 }
 
 /*
  * "encrypt" routine (for backwards compatibility)
  */

+#if __DARWIN_UNIX03
+void encrypt(block, flag)
+#else /* !__DARWIN_UNIX03 */

 int encrypt(block, flag)
 int encrypt(block, flag)

+#endif /* __DARWIN_UNIX03 */

        register char *block;
        int flag;
 {
        register int i, j, k;
        C_block cblock;
 
        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++) {
        for (i = 0; i < 8; i++) {
                k = 0;
                for (j = 0; j < 8; j++) {


@@ -960,8 +1007,12 @@ int encrypt(block, flag)
                }
                cblock.b[i] = k;
        }
                }
                cblock.b[i] = k;
        }

-       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);
                return (1);

+#endif /* __DARWIN_UNIX03 */

        for (i = 7; i >= 0; i--) {
                k = cblock.b[i];
                for (j = 7; j >= 0; j--) {
        for (i = 7; i >= 0; i--) {
                k = cblock.b[i];
                for (j = 7; j >= 0; j--) {


@@ -969,11 +1020,14 @@ int encrypt(block, flag)
                        k >>= 1;
                }
        }
                        k >>= 1;
                }
        }

+#if !__DARWIN_UNIX03

        return (0);
        return (0);

+#endif /* !__DARWIN_UNIX03 */

 }
 
 }
 

+#ifndef BUILDING_VARIANT

 #ifdef DEBUG
 #ifdef DEBUG

-STATIC
+STATIC void

 prtab(s, t, num_rows)
        char *s;
        unsigned char *t;
 prtab(s, t, num_rows)
        char *s;
        unsigned char *t;


@@ -991,3 +1045,6 @@ prtab(s, t, num_rows)
        (void)printf("\n");
 }
 #endif
        (void)printf("\n");
 }
 #endif

+#endif /* BUILDING_VARIANT */
+
+#pragma clang diagnostic pop