From: Patrik Kis Date: Fri, 24 Oct 2014 14:15:05 +0000 (+0200) Subject: Add missing salt from enctype in t_kdb.py test X-Git-Tag: krb5-1.12.3-final~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a4509028ae7c7cf00af38cde879428f03fe5e6;p=thirdparty%2Fkrb5.git Add missing salt from enctype in t_kdb.py test In commit 78a7f2a02b82bf297817cd717f092ead40b575b2, which added a test for bug #7980, some command invocations used new syntax that omitted salt types from the keysalt list. This omission of salt types is not supported on krb5-1.12, resulting in test failures. Update to use the valid (old) key salt syntax. [tlyu@mit.edu: commit message] ticket: 8071 (new) version_fixed: 1.12.3 status: resolved --- diff --git a/src/tests/t_kdb.py b/src/tests/t_kdb.py index 7cd6fa623e..4ad4b153f0 100644 --- a/src/tests/t_kdb.py +++ b/src/tests/t_kdb.py @@ -286,12 +286,12 @@ realm.kinit(realm.user_princ, flags=['-R', '-S', 'alias']) realm.klist(realm.user_princ, 'alias@KRBTEST.COM') # Regression test for #7980 (fencepost when dividing keys up by kvno). -realm.run_kadminl('addprinc -randkey -e aes256-cts,aes128-cts kvnoprinc') -realm.run_kadminl('cpw -randkey -keepold -e aes256-cts,aes128-cts kvnoprinc') +realm.run_kadminl('addprinc -randkey -e aes256-cts:normal,aes128-cts:normal kvnoprinc') +realm.run_kadminl('cpw -randkey -keepold -e aes256-cts:normal,aes128-cts:normal kvnoprinc') out = realm.run_kadminl('getprinc kvnoprinc') if 'Number of keys: 4' not in out: fail('After cpw -keepold, wrong number of keys') -realm.run_kadminl('cpw -randkey -keepold -e aes256-cts,aes128-cts kvnoprinc') +realm.run_kadminl('cpw -randkey -keepold -e aes256-cts:normal,aes128-cts:normal kvnoprinc') out = realm.run_kadminl('getprinc kvnoprinc') if 'Number of keys: 6' not in out: fail('After cpw -keepold, wrong number of keys')