diff options
| author | no author <devnull@mit.edu> | 2004-05-17 19:28:46 +0000 |
|---|---|---|
| committer | no author <devnull@mit.edu> | 2004-05-17 19:28:46 +0000 |
| commit | ef4d928fc937a354577c397ec8e723e920ff7351 (patch) | |
| tree | 8ed7a02bd110ed46492e88c6e67d1997bbde297f /src/lib/crypto/combine_keys.c | |
| parent | 6670198c5e4945eaabfec95e24b0c47c7d97fc44 (diff) | |
| download | krb5-kfw-2.6.2-beta2.zip krb5-kfw-2.6.2-beta2.tar.gz krb5-kfw-2.6.2-beta2.tar.bz2 | |
This commit was manufactured by cvs2svn to create tagkfw-2.6.2-beta2
'kfw-2_6_2-beta-2'.
git-svn-id: svn://anonsvn.mit.edu/krb5/tags/kfw-2_6_2-beta-2@16344 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/combine_keys.c')
| -rw-r--r-- | src/lib/crypto/combine_keys.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/lib/crypto/combine_keys.c b/src/lib/crypto/combine_keys.c index 6466a95..9aad8f5 100644 --- a/src/lib/crypto/combine_keys.c +++ b/src/lib/crypto/combine_keys.c @@ -50,6 +50,25 @@ static krb5_error_code dr (const struct krb5_enc_provider *enc, const krb5_keyblock *inkey, unsigned char *outdata, const krb5_data *in_constant); +/* + * We only support this combine_keys algorithm for des and 3des keys. + * Everything else should use the PRF defined in the crypto framework. + * We don't implement that yet. + */ + +static krb5_boolean enctype_ok (krb5_enctype e) +{ + switch (e) { + case ENCTYPE_DES_CBC_CRC: + case ENCTYPE_DES_CBC_MD4: + case ENCTYPE_DES_CBC_MD5: + case ENCTYPE_DES3_CBC_SHA1: + return 1; + default: + return 0; + } +} + krb5_error_code krb5int_c_combine_keys (krb5_context context, krb5_keyblock *key1, krb5_keyblock *key2, krb5_keyblock *outkey) { @@ -60,6 +79,9 @@ krb5_error_code krb5int_c_combine_keys krb5_keyblock tkey; krb5_error_code ret; int i, myalloc = 0; + if (!(enctype_ok(key1->enctype)&&enctype_ok(key2->enctype))) + return (KRB5_CRYPTO_INTERNAL); + if (key1->length != key2->length || key1->enctype != key2->enctype) return (KRB5_CRYPTO_INTERNAL); |