summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/des/string2key.c
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1996-04-09 22:47:25 +0000
committerMark Eichin <eichin@mit.edu>1996-04-09 22:47:25 +0000
commit22e73ee43286cc41da2d8fbdfd26047108aa9f11 (patch)
treecb52491190d94bcf7229ee119b95876b17feacd7 /src/lib/crypto/des/string2key.c
parent5abaad70a4b167de05829a142c75bad660b898b5 (diff)
downloadkrb5-22e73ee43286cc41da2d8fbdfd26047108aa9f11.tar.gz
krb5-22e73ee43286cc41da2d8fbdfd26047108aa9f11.tar.xz
krb5-22e73ee43286cc41da2d8fbdfd26047108aa9f11.zip
add afsstring2key
hack des string2key to call it if salt.length is -1 initialize context in testsuite git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7768 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/des/string2key.c')
-rw-r--r--src/lib/crypto/des/string2key.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index 7c58b50833..8a2b1415b7 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -77,8 +77,13 @@ const krb5_data FAR * salt;
keyblock->enctype = eblock->crypto_entry->proto_enctype;
key = keyblock->contents;
- if (salt)
+ if (salt) {
+ if (salt->length == -1) {
+ /* cheat and do AFS string2key instead */
+ return mit_afs_string_to_key (eblock, keyblock, data, salt);
+ } else
length = data->length + salt->length;
+ }
else
length = data->length;