diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-03-21 18:07:41 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-03-26 18:12:31 -0400 |
| commit | 54c97cd0c435f78880d80541a20cf7f08928705d (patch) | |
| tree | 2487b4ccf15dcaaaec76fe5969fe28bbcbb274f1 /doc/admin/advanced | |
| parent | 3890d1dff87a839efec38a77dcc88574ed65f4a9 (diff) | |
| download | krb5-54c97cd0c435f78880d80541a20cf7f08928705d.tar.gz krb5-54c97cd0c435f78880d80541a20cf7f08928705d.tar.xz krb5-54c97cd0c435f78880d80541a20cf7f08928705d.zip | |
Improve salt type display in kadmin getprinc
In krb5_salttype_to_string, output the salt type name we would
recognize as input.
In the output of getprinc, display the enctype and salt type in a form
we would accept--either enctype:salttype if the salt type is not the
default, or just the enctype if it is.
Update t_mkey.py and t_salt.py to expect the new output format.
Update documentation examples to show the new format.
ticket: 5958
Diffstat (limited to 'doc/admin/advanced')
| -rw-r--r-- | doc/admin/advanced/retiring-des.rst | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/admin/advanced/retiring-des.rst b/doc/admin/advanced/retiring-des.rst index cbca1b798..2b80f3c57 100644 --- a/doc/admin/advanced/retiring-des.rst +++ b/doc/admin/advanced/retiring-des.rst @@ -91,17 +91,17 @@ and the database entries for some "high-value" principals were: [root@casio krb5kdc]# kadmin.local -r ZONE.MIT.EDU -q 'getprinc krbtgt/ZONE.MIT.EDU' [...] Number of keys: 1 - Key: vno 1, des-cbc-crc, Version 4 + Key: vno 1, des-cbc-crc:v4 [...] [root@casio krb5kdc]# kadmin.local -r ZONE.MIT.EDU -q 'getprinc kadmin/admin' [...] Number of keys: 1 - Key: vno 15, des-cbc-crc, no salt + Key: vno 15, des-cbc-crc [...] [root@casio krb5kdc]# kadmin.local -r ZONE.MIT.EDU -q 'getprinc kadmin/changepw' [...] Number of keys: 1 - Key: vno 14, des-cbc-crc, no salt + Key: vno 14, des-cbc-crc [...] The ``krbtgt/REALM`` key appears to have never been changed since creation @@ -162,11 +162,11 @@ After the change, the database entry is now: [root@casio krb5kdc]# kadmin.local -r ZONE.MIT.EDU -q 'getprinc krbtgt/ZONE.MIT.EDU' [...] Number of keys: 5 - Key: vno 2, aes256-cts-hmac-sha1-96, no salt - Key: vno 2, aes128-cts-hmac-sha1-96, no salt - Key: vno 2, des3-cbc-sha1, no salt - Key: vno 2, des-cbc-crc, no salt - Key: vno 1, des-cbc-crc, Version 4 + Key: vno 2, aes256-cts-hmac-sha1-96 + Key: vno 2, aes128-cts-hmac-sha1-96 + Key: vno 2, des3-cbc-sha1 + Key: vno 2, des-cbc-crc + Key: vno 1, des-cbc-crc:v4 [...] Since the expected disruptions from rekeying the krbtgt principal are @@ -357,9 +357,9 @@ generate DES keys by default. contents-vnder-pressvre:~> kadmin -r ZONE.MIT.EDU -q 'getprinc zonetest' [...] Number of keys: 3 - Key: vno 9, aes256-cts-hmac-sha1-96, no salt - Key: vno 9, aes128-cts-hmac-sha1-96, no salt - Key: vno 9, des3-cbc-sha1, no salt + Key: vno 9, aes256-cts-hmac-sha1-96 + Key: vno 9, aes128-cts-hmac-sha1-96 + Key: vno 9, des3-cbc-sha1 [...] [kaduk@glossolalia ~]$ kadmin -p kaduk@ZONE.MIT.EDU -r ZONE.MIT.EDU -k \ |