pull up r18837 from trunk

 r18837@cathode-dark-space:  coffman | 2006-11-17 14:56:35 -0500
 ticket: 4799
 Target_Version: 1.6
 Tags: pullup

 Didn't include header changes in the previous commit.

ticket: 4799

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18891 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 5064edefb1634c382506aa5155d50a4aaeb91680..9d9920efd880cc45c3039c57de16b714f42fd00c 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -437,9 +437,9 @@ krb5_error_code KRB5_CALLCONV
                    size_t *blocksize);
 
 krb5_error_code KRB5_CALLCONV
-    krb5_c_keylength
+    krb5_c_keylengths
     (krb5_context context, krb5_enctype enctype,
-                   size_t *keylength);
+                   size_t *keybytes, size_t *keylength);
 
 krb5_error_code KRB5_CALLCONV
        krb5_c_init_state
@@ -463,6 +463,11 @@ krb5_error_code KRB5_CALLCONV
     (krb5_context context, krb5_enctype enctype,
                    krb5_keyblock *k5_random_key);
 
+krb5_error_code KRB5_CALLCONV
+    krb5_c_random_to_key
+    (krb5_context context, krb5_enctype enctype,
+                   krb5_data *random_data, krb5_keyblock *k5_random_key);
+
 /* Register a new entropy sample  with the PRNG. may cause
 * the PRNG to be reseeded, although this is not guaranteed.  See previous randsource definitions
 * for information on how each source should be used.