diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
| commit | 140e24e9149eabe8793d439a7d386c78ecb00fab (patch) | |
| tree | fccb86dad4bd892ba5be6660c91a6222992bdf7f /src/windows | |
| parent | 97b6d19bc89c8eb6754225875890e0f2dbdd929d (diff) | |
Merge the camellia-ccm branch to trunk. Since there are no IANA
assignments for Camellia-CCM enctypes or cksumtypes yet, they are
disabled in a default build. They can be made available by defining
(via CPPFLAGS) local-use enctype numbers for the enctypes and
cksumtypes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24295 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/identity/plugins/krb5/datarep.c | 8 | ||||
| -rw-r--r-- | src/windows/identity/plugins/krb5/lang/en_us/langres.rc | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/windows/identity/plugins/krb5/datarep.c b/src/windows/identity/plugins/krb5/datarep.c index d0478a070..f260eceea 100644 --- a/src/windows/identity/plugins/krb5/datarep.c +++ b/src/windows/identity/plugins/krb5/datarep.c @@ -93,6 +93,14 @@ enctype_toString(const void * data, khm_size cbdata, resid = IDS_ETYPE_AES256_CTS_HMAC_SHA1_96; break; + case ENCTYPE_CAMELLIA128_CCM_128: + resid = IDS_ETYPE_CAMELLIA128_CCM_128; + break; + + case ENCTYPE_CAMELLIA256_CCM_128: + resid = IDS_ETYPE_CAMELLIA256_CCM_128; + break; + case ENCTYPE_ARCFOUR_HMAC: resid = IDS_ETYPE_ARCFOUR_HMAC; break; diff --git a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc index bcf837587..a98064e43 100644 --- a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc +++ b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc @@ -364,6 +364,8 @@ BEGIN IDS_ETYPE_DES3_CBC_SHA1 "DES3-CBC-SHA1" IDS_ETYPE_AES128_CTS_HMAC_SHA1_96 "AES128_CTS-HMAC-SHA1_96" IDS_ETYPE_AES256_CTS_HMAC_SHA1_96 "AES256_CTS-HMAC-SHA1_96" + IDS_ETYPE_CAMELLIA128_CCM_128 "CAMELLIA128_CCM-128" + IDS_ETYPE_CAMELLIA256_CCM_128 "CAMELLIA256_CCM-128" IDS_ETYPE_ARCFOUR_HMAC "RC4-HMAC-NT" IDS_ETYPE_ARCFOUR_HMAC_EXP "RC4-HMAC-NT-EXP" IDS_ETYPE_UNKNOWN "(Unknown)" |