diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 39857212830a..7869e96864e5 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -99,7 +99,7 @@ init_des_cipher(void)
 
 	/* initialize the padding vector */
 	for (i = 0; i < 8; i++)
-		pvec[i] = (char) (arc4random() % 256);
+		pvec[i] = (char)arc4random_uniform(256);
 #endif
 }
 
@@ -164,7 +164,7 @@ get_keyword(void)
 	/*
 	 * get the key
 	 */
-	if (*(p = getpass("Enter key: "))) {
+	if ((p = getpass("Enter key: ")) != NULL && *p != '\0') {
 
 		/*
 		 * copy it, nul-padded, into the key area