From 01f30a7f06110f54c5d69fdd7697347c102f5274 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Tue, 9 Oct 2012 14:27:04 -0400 Subject: De-conditionalize Camellia code The Camellia enctypes and cksumtypes have received IANA assignments. Add #defines using those assignments to krb5.h, remove the CAMELLIA conditional, and enable testing code as appropriate. The Camellia draft has not received an RFC number yet, so there is no Doxygen markup for the enctype and cksumtype #defines. That can be added once the RFC number is known. --- src/util/k5test.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/util') diff --git a/src/util/k5test.py b/src/util/k5test.py index 6af782c72..4fd8cf752 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -1185,15 +1185,14 @@ _passes = [ 'master_key_type' : 'aes128-cts'}}}}), # Exercise the camellia256-cts enctype. -# Enable when Camellia support becomes unconditional. -# ('camellia256', None, -# {'all' : {'libdefaults' : { -# 'default_tgs_enctypes' : 'camellia256-cts', -# 'default_tkt_enctypes' : 'camellia256-cts', -# 'permitted_enctypes' : 'camellia256-cts'}}}, -# {'master' : {'realms' : {'$realm' : { -# 'supported_enctypes' : 'camellia256-cts:normal', -# 'master_key_type' : 'camellia256-cts'}}}}), + ('camellia256', None, + {'all' : {'libdefaults' : { + 'default_tgs_enctypes' : 'camellia256-cts', + 'default_tkt_enctypes' : 'camellia256-cts', + 'permitted_enctypes' : 'camellia256-cts'}}}, + {'master' : {'realms' : {'$realm' : { + 'supported_enctypes' : 'camellia256-cts:normal', + 'master_key_type' : 'camellia256-cts'}}}}), # Test a setup with modern principal keys but an old TGT key. ('aes256.destgt', 'des-cbc-crc:normal', -- cgit