diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-02-27 19:08:14 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-02-27 19:08:14 +0000 |
| commit | ec044ad8e3eafb829a43fbd1cb11b94fea6027fb (patch) | |
| tree | 62695fd64027f1041cd18453fe41b1a9b6c08898 /src/lib/crypto/krb/cf2.c | |
| parent | 73b80b790cb90d012600d74c9ce2b36be45c3090 (diff) | |
| download | krb5-ec044ad8e3eafb829a43fbd1cb11b94fea6027fb.tar.gz krb5-ec044ad8e3eafb829a43fbd1cb11b94fea6027fb.tar.xz krb5-ec044ad8e3eafb829a43fbd1cb11b94fea6027fb.zip | |
Reference random-to-key handlers through the enctype instead of the
enc_provider, for consistency with string-to-key and the place of
implementation (other enc_provider functions are implemented in the
back end, but random-to-key handlers are in krb). Use a single
handler for non-DES/DES3 enctypes since it's always just directly
copying the bits. Collapse the three implementations (des, des3, and
direct) into random_to_key.c, as they're very short, and eliminate the
lib/crypto/krb/rand2key directory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24669 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/krb/cf2.c')
| -rw-r--r-- | src/lib/crypto/krb/cf2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c index ab0a134b9d..6e7ecdc3d1 100644 --- a/src/lib/crypto/krb/cf2.c +++ b/src/lib/crypto/krb/cf2.c @@ -136,7 +136,7 @@ krb5_c_fx_cf2_simple(krb5_context context, goto cleanup; keydata.data = prf1; keydata.length = keybytes; - retval = (*out_enctype->enc->make_key)(&keydata, out_key); + retval = (*out_enctype->rand2key)(&keydata, out_key); if (retval) goto cleanup; |