summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2009-03-16 16:50:09 +0000
committerSam Hartman <hartmans@mit.edu>2009-03-16 16:50:09 +0000
commitcd2564d812f83c6dc9ae0b7a0da93f49b35a574d (patch)
tree40512e5002d3cd1556988822a98f09ec27fcbdf5 /src/include
parent1dfc62e02bcfee4e9b0194a2c5dd956ce7d86c4b (diff)
downloadkrb5-cd2564d812f83c6dc9ae0b7a0da93f49b35a574d.tar.gz
krb5-cd2564d812f83c6dc9ae0b7a0da93f49b35a574d.tar.xz
krb5-cd2564d812f83c6dc9ae0b7a0da93f49b35a574d.zip
Implement KRB-FX_CF2
Draft-ietf-krb-wg-preauth-framework defines a function KRB-FX-CF2 that combines two keys of arbitrary enctype. Implement this function as an exported API. ticket: 6421 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22094 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/krb5/krb5.hin15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 7d738a6704..69fb038ce1 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -497,6 +497,21 @@ krb5_error_code KRB5_CALLCONV
krb5_error_code KRB5_CALLCONV
krb5_c_prf_length (krb5_context, krb5_enctype, size_t *outlen);
+krb5_error_code KRB5_CALLCONV
+krb5_c_fx_cf2_simple(krb5_context context,
+ krb5_keyblock *k1, const char *pepper1,
+ krb5_keyblock *k2, const char *pepper2,
+ krb5_keyblock **out);
+ /* Returns KRB-FX-CF2 in a newly allocated
+ * keyblock on success or an error code on error.
+ * This function is simple in that it assumes
+ * pepper1 and pepper2 are C strings with no
+ * internal nulls and that the enctype of the
+ * result will be the same as that of k1. Both
+ * of these assumptions are true of current
+ * specs.
+ */
+
krb5_error_code KRB5_CALLCONV
krb5_c_make_random_key