diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-09-30 21:57:42 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-09-30 21:57:42 +0000 |
| commit | 267657197005c84ec8af9a030b23d14f3be68f32 (patch) | |
| tree | d927e631ca038c256159e50835bcec5d87135be9 /src/lib/crypto/krb/make_checksum_iov.c | |
| parent | a787dec7564f865343ed511cd1710d3847d8778b (diff) | |
| download | krb5-267657197005c84ec8af9a030b23d14f3be68f32.zip krb5-267657197005c84ec8af9a030b23d14f3be68f32.tar.gz krb5-267657197005c84ec8af9a030b23d14f3be68f32.tar.bz2 | |
Merge r24242:24397 from trunk to branches/nss. This will break the
nss branch build temporarily due to Camellia changes.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/nss@24398 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/krb/make_checksum_iov.c')
| -rw-r--r-- | src/lib/crypto/krb/make_checksum_iov.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/crypto/krb/make_checksum_iov.c b/src/lib/crypto/krb/make_checksum_iov.c index dcffa48..a7a3cb3 100644 --- a/src/lib/crypto/krb/make_checksum_iov.c +++ b/src/lib/crypto/krb/make_checksum_iov.c @@ -42,6 +42,12 @@ krb5_k_make_checksum_iov(krb5_context context, krb5_crypto_iov *checksum; const struct krb5_cksumtypes *ctp; + if (cksumtype == 0) { + ret = krb5int_c_mandatory_cksumtype(context, key->keyblock.enctype, + &cksumtype); + if (ret != 0) + return ret; + } ctp = find_cksumtype(cksumtype); if (ctp == NULL) return KRB5_BAD_ENCTYPE; |