Print this page
3882 remove xmod & friends

@@ -58,11 +58,10 @@
 static char hexval();
 
 int passwd2des(char *, char *);
 static int weak_DES_key(des_block);
 
-/* EXPORT DELETE START */
 /*
  * For export control reasons, we want to limit the maximum size of
  * data that can be encrypted or decrypted.  We limit this to 1024
  * bits of key data, which amounts to 128 bytes.
  *

@@ -71,11 +70,10 @@
  * being used by the new 1024bit keys plus 16 bytes MD5 checksum.
  * We discussed this with Sun's export control office and lawyers
  * and we have reason to believe this is ok for export.
  */
 #define MAX_KEY_CRYPT_LEN       144
-/* EXPORT DELETE END */
 
 /*
  * Encrypt a secret key given passwd
  * The secret key is passed and returned in hex notation.
  * Its length must be a multiple of 16 hex digits (64 bits).

@@ -83,11 +81,10 @@
 int
 xencrypt(secret, passwd)
         char *secret;
         char *passwd;
 {
-/* EXPORT DELETE START */
         char key[8];
         char ivec[8];
         char *buf;
         int err;
         int len;

@@ -106,16 +103,10 @@
                 return (0);
         }
         (void) bin2hex(len, (unsigned char *) buf, secret);
         free(buf);
         return (1);
-#if 0
-/* EXPORT DELETE END */
-        return (0);
-/* EXPORT DELETE START */
-#endif
-/* EXPORT DELETE END */
 }
 
 /*
  * Decrypt secret key using passwd
  * The secret key is passed and returned in hex notation.

@@ -124,11 +115,10 @@
 int
 xdecrypt(secret, passwd)
         char *secret;
         char *passwd;
 {
-/* EXPORT DELETE START */
         char key[8];
         char ivec[8];
         char *buf;
         int err;
         int len;

@@ -148,16 +138,10 @@
                 return (0);
         }
         (void) bin2hex(len, (unsigned char *) buf, secret);
         free(buf);
         return (1);
-#if 0
-/* EXPORT DELETE END */
-        return (0);
-/* EXPORT DELETE START */
-#endif
-/* EXPORT DELETE END */
 }
 
 /*
  * Turn password into DES key
  */

@@ -262,11 +246,10 @@
         const char *passwd,             /* in  */
         const char netname[],           /* in  */
         char **encrypted_secret,        /* out */
         bool_t do_chksum)               /* in  */
 {
-/* EXPORT DELETE START */
         des_block key;
         char ivec[8];
         char *binkeybuf;
         int err;
         const int classic_des = keylen == 192 && algtype == 0;

@@ -340,16 +323,10 @@
         }
         (void) bin2hex(binkeybytes, (unsigned char *) binkeybuf, hexkeybuf);
         free(binkeybuf);
         *encrypted_secret = hexkeybuf;
         return (1);
-#if 0
-/* EXPORT DELETE END */
-        return (0);
-/* EXPORT DELETE START */
-#endif
-/* EXPORT DELETE END */
 }
 
 /*
  * Generic key len and alg type for version of xdecrypt.
  *

@@ -373,11 +350,10 @@
         int algtype,            /* in  */
         const char *passwd,     /* in  */
         const char netname[],   /* in  */
         bool_t do_chksum)       /* in  */
 {
-/* EXPORT DELETE START */
         des_block key;
         char ivec[8];
         char *buf;
         int err;
         int len;

@@ -441,16 +417,10 @@
                 }
 
         secret[hexkeybytes] = '\0';
 
         return (1);
-#if 0
-/* EXPORT DELETE END */
-        return (0);
-/* EXPORT DELETE START */
-#endif
-/* EXPORT DELETE END */
 }
 
 
 /*
  * Modified version of passwd2des(). passwd2des_g() uses the Kerberos