merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b

kadmin/ank.c

@@ -88,7 +88,15 @@ add_new_key(int argc, char **argv)
 	password = "hemlig";
     }
     if(password == NULL){
-	if(des_read_pw_string(pwbuf, sizeof(pwbuf), "Password: ", 1))
+	char *princ_name;
+	char *prompt;
+
+	krb5_unparse_name(context, princ_ent, &princ_name);
+	asprintf (&prompt, "%s's Password: ", princ_name);
+	free (princ_name);
+	ret = des_read_pw_string (pwbuf, sizeof(pwbuf), prompt, 1);
+	free (prompt);
+	if (ret)
 	    goto out;
 	password = pwbuf;
     }