merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
1999-02-11 21:03:59 +00:00
parent 0a6c3f7fde
commit aaae186ab9
83 changed files with 4175 additions and 1509 deletions
--- a/lib/krb5/get_in_tkt_with_skey.c
+++ b/lib/krb5/get_in_tkt_with_skey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska H<>gskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
 * (Royal Institute of Technology, Stockholm, Sweden). 
 * All rights reserved. 
 *
@@ -42,8 +42,8 @@ RCSID("$Id$");

 static krb5_error_code
 krb5_skey_key_proc (krb5_context context,
-		    krb5_keytype type,
-		    krb5_data *salt,
+		    krb5_enctype type,
+		    krb5_salt salt,
 		    krb5_const_pointer keyseed,
 		    krb5_keyblock **key)
 {