From: Simon Wilkinson Date: Mon, 7 Mar 2011 17:23:51 +0000 (+0000) Subject: crypto: Add krb5_crypto_fx_cf2 to our prototypes X-Git-Tag: upstream/1.8.0_pre1^2~4063 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f6f8158ada81a50961699de68f6f2348fcc4a955;p=packages%2Fo%2Fopenafs.git crypto: Add krb5_crypto_fx_cf2 to our prototypes Admit to having the krb5_crypto_fx_cf2 function in the kernel RFC3961 implementation - we're going to use it for for key combining Change-Id: Ibb11a4d7467bc18eb222d5f8902dc4181b30e92c Reviewed-on: http://gerrit.openafs.org/4204 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/crypto/rfc3961/rfc3961.h b/src/crypto/rfc3961/rfc3961.h index 2b285e160..1ac32c3a1 100644 --- a/src/crypto/rfc3961/rfc3961.h +++ b/src/crypto/rfc3961/rfc3961.h @@ -125,6 +125,14 @@ krb5_error_code krb5_crypto_prf(krb5_context context, const krb5_data *input, krb5_data *output); +krb5_error_code krb5_crypto_fx_cf2(krb5_context context, + const krb5_crypto crypto1, + const krb5_crypto crypto2, + krb5_data *pepper1, + krb5_data *pepper2, + krb5_enctype enctype, + krb5_keyblock *res); + krb5_error_code krb5_generate_random_block(void *buf, size_t len); krb5_error_code krb5_random_to_key(krb5_context context,