Cleanup crypt and remove the crypt_r stuff, since SuSv3

(IEEE Std 1003.1-2001) states that crypt need not be reentrant.
 -Erik

1 files changed, 1 insertions, 29 deletions

diff --git a/include/crypt.h b/include/crypt.h
index a35d8c0bd..f3fed7ca7 100644
--- a/include/crypt.h
+++ b/include/crypt.h
@@ -26,7 +26,7 @@
 __BEGIN_DECLS
 
 /* Encrypt characters from KEY using salt to perturb the encryption method.
- * If salt begins with "$1$", md5 hashing is used instead of DES. */
+ * If salt begins with "$1$", MD5 hashing is used instead of DES. */
 extern char *crypt (const char *__key, const char *__salt);
 
 /* Setup DES tables according KEY.  */
@@ -36,34 +36,6 @@ extern void setkey (const char *__key);
    block in place.  */
 extern void encrypt (char *__block, int __edflag);
 
-
-/* Reentrant versions of the functions above.  The additional argument
-   points to a structure where the results are placed in.  */
-struct block {
-	unsigned char b_data[64];
-};
-struct ordering {
-	unsigned char o_data[64];
-};
-struct crypt_data
-{
-    /* Stuff used by the des based routines */
-    struct block key;
-    const struct ordering *EP;
-    /* Stuff used by the md5 based routines */
-    char *p;
-    const char *sp,*ep;
-};
-
-extern char *crypt_r (const char *__key, const char *__salt,
-		      struct crypt_data * __data);
-
-extern void setkey_r (const char *__key,
-		      struct crypt_data * __data);
-
-extern void encrypt_r (char *__block, int __edflag,
-		       struct crypt_data * __data);
-
 __END_DECLS
 
 #endif	/* crypt.h */