diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index eb3209ec397482631293e046fe60c0f1cb5b3da5..14609130128b0436d23fd02f476a3facd3e37ff5 100644
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -34,7 +34,7 @@
  * This routinue should be extended to support additional sources
  * of entropy.
  */
-int lutil_entropy( char *buf, ber_len_t nbytes )
+int lutil_entropy( unsigned char *buf, ber_len_t nbytes )
 {
 	if( nbytes == 0 ) return 0;
 
@@ -96,7 +96,7 @@ int lutil_entropy( char *buf, ber_len_t nbytes )
 		struct rdata_s {
 			int counter;
 
-			char *buf;
+			unsigned char *buf;
 			struct rdata_s *stack;
 
 			pid_t	pid;
@@ -134,10 +134,10 @@ int lutil_entropy( char *buf, ber_len_t nbytes )
 			rdata.junk++;
 
 			lutil_MD5Init( &ctx );
-			lutil_MD5Update( &ctx, (char *) &rdata, sizeof( rdata ) );
+			lutil_MD5Update( &ctx, (unsigned char *) &rdata, sizeof( rdata ) );
 
 			/* allow caller to provided additional entropy */
-			lutil_MD5Update( &ctx, (char *) &buf, nbytes );
+			lutil_MD5Update( &ctx, buf, nbytes );
 
 			lutil_MD5Final( digest, &ctx );
 
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 427af165a02780c2529efda6dd0abc084ab22bb2..8fc3a07ac97e99702160c790953666af8081e8fe 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -521,9 +521,10 @@ static int chk_smd5(
 	/* hash credentials with salt */
 	lutil_MD5Init(&MD5context);
 	lutil_MD5Update(&MD5context,
-		(const unsigned char *) cred->bv_val, cred->bv_len );
+		(const unsigned char *) cred->bv_val,
+		cred->bv_len );
 	lutil_MD5Update(&MD5context,
-		(const unsigned char *) &orig_pass[sizeof(MD5digest)],
+		&orig_pass[sizeof(MD5digest)],
 		rc - sizeof(MD5digest));
 	lutil_MD5Final(MD5digest, &MD5context);
 
@@ -558,7 +559,8 @@ static int chk_md5(
 	/* hash credentials with salt */
 	lutil_MD5Init(&MD5context);
 	lutil_MD5Update(&MD5context,
-		(const unsigned char *) cred->bv_val, cred->bv_len );
+		(const unsigned char *) cred->bv_val,
+		cred->bv_len );
 	lutil_MD5Final(MD5digest, &MD5context);
 
 	/* compare */