Merge branch 'crypt-cleanup' into 'master'

crypt header cleanup

See merge request redox-os/relibc!849

src/header/crypt/mod.rs

@@ -16,7 +16,10 @@ use rand::{RngCore, SeedableRng, rngs::SmallRng};
 use crate::{
     c_str::CStr,
     header::{errno::EINVAL, stdlib::rand},
-    platform::{self, types::*},
+    platform::{
+        self,
+        types::{c_char, c_int},
+    },
 };
 
 mod argon2;
@@ -32,7 +35,10 @@ use self::{
     md5::crypt_md5,
     pbkdf2::crypt_pbkdf2,
     scrypt::crypt_scrypt,
-    sha::{ShaType::*, crypt_sha},
+    sha::{
+        ShaType::{Sha256, Sha512},
+        crypt_sha,
+    },
 };
 
 /// See <https://www.man7.org/linux/man-pages/man3/crypt.3.html>.

src/header/crypt/scrypt.rs

@@ -1,5 +1,5 @@
 use super::gen_salt;
-use crate::platform::types::*;
+use crate::platform::types::{c_uchar, c_uint};
 use alloc::string::{String, ToString};
 use base64ct::{Base64Bcrypt, Encoding};
 use core::{str, u32};

src/header/crypt/sha.rs

@@ -5,7 +5,7 @@ use sha_crypt::{
     sha512_crypt_b64,
 };
 
-use crate::platform::types::*;
+use crate::platform::types::c_ulong;
 
 // key limit is not part of the original design, added for DoS protection.
 // rounds limit has been lowered (versus the reference/spec), also for DoS