merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-02-11 21:03:59 +00:00
parent 0a6c3f7fde
commit aaae186ab9
83 changed files with 4175 additions and 1509 deletions

View File

@@ -42,28 +42,25 @@ RCSID("$Id$");
krb5_error_code
krb5_password_key_proc (krb5_context context,
krb5_keytype type,
krb5_data *salt,
krb5_enctype type,
krb5_salt salt,
krb5_const_pointer keyseed,
krb5_keyblock **key)
{
krb5_error_code ret;
char *password = (char *)keyseed;
char buf[BUFSIZ];
krb5_error_code ret;
char *password = (char *)keyseed;
char buf[BUFSIZ];
*key = malloc (sizeof (**key));
if (*key == NULL)
return ENOMEM;
(*key)->keytype = type;
(*key)->keyvalue.length = 0;
(*key)->keyvalue.data = NULL;
if (password == NULL) {
des_read_pw_string (buf, sizeof(buf), "Password: ", 0);
password = buf;
}
ret = krb5_string_to_key (password, salt, type, *key);
memset (buf, 0, sizeof(buf));
return ret;
*key = malloc (sizeof (**key));
if (*key == NULL)
return ENOMEM;
if (password == NULL) {
des_read_pw_string (buf, sizeof(buf), "Password: ", 0);
password = buf;
}
ret = krb5_string_to_key_salt (context, type, password, salt, *key);
memset (buf, 0, sizeof(buf));
return ret;
}
krb5_error_code