Modernize example enctypes in documentation

ticket: 8805 (new)

5 files changed, 18 insertions, 23 deletions

diff --git a/doc/admin/admin_commands/kadmin_local.rst b/doc/admin/admin_commands/kadmin_local.rst
index 150da1f..71aa894 100644
--- a/doc/admin/admin_commands/kadmin_local.rst
+++ b/doc/admin/admin_commands/kadmin_local.rst
@@ -569,16 +569,16 @@ Examples::
     Principal: tlyu/admin@BLEEP.COM
     Expiration date: [never]
     Last password change: Mon Aug 12 14:16:47 EDT 1996
-    Password expiration date: [none]
+    Password expiration date: [never]
     Maximum ticket life: 0 days 10:00:00
     Maximum renewable life: 7 days 00:00:00
     Last modified: Mon Aug 12 14:16:47 EDT 1996 (bjaspan/admin@BLEEP.COM)
     Last successful authentication: [never]
     Last failed authentication: [never]
     Failed password attempts: 0
-    Number of keys: 2
-    Key: vno 1, des-cbc-crc
-    Key: vno 1, des-cbc-crc:v4
+    Number of keys: 1
+    Key: vno 1, aes256-cts-hmac-sha384-192
+    MKey: vno 1
     Attributes:
     Policy: [none]
 
diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index 7dd54f7..444c58b 100644
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -476,17 +476,17 @@ Examples::
     $ kdb5_util tabdump -o keyinfo.txt keyinfo
     $ cat keyinfo.txt
     name	keyindex	kvno	enctype	salttype	salt
+    K/M@EXAMPLE.COM	0	1	aes256-cts-hmac-sha384-192	normal	-1
     foo@EXAMPLE.COM	0	1	aes128-cts-hmac-sha1-96	normal	-1
     bar@EXAMPLE.COM	0	1	aes128-cts-hmac-sha1-96	normal	-1
-    bar@EXAMPLE.COM	1	1	des-cbc-crc	normal	-1
     $ sqlite3
     sqlite> .mode tabs
     sqlite> .import keyinfo.txt keyinfo
-    sqlite> select * from keyinfo where enctype like 'des-cbc-%';
-    bar@EXAMPLE.COM	1	1	des-cbc-crc	normal	-1
+    sqlite> select * from keyinfo where enctype like 'aes256-%';
+    K/M@EXAMPLE.COM	1	1	aes256-cts-hmac-sha384-192	normal	-1
     sqlite> .quit
-    $ awk -F'\t' '$4 ~ /des-cbc-/ { print }' keyinfo.txt
-    bar@EXAMPLE.COM	1	1	des-cbc-crc	normal	-1
+    $ awk -F'\t' '$4 ~ /aes256-/ { print }' keyinfo.txt
+    K/M@EXAMPLE.COM	1	1	aes256-cts-hmac-sha384-192	normal	-1
 
 
 ENVIRONMENT
diff --git a/doc/admin/database.rst b/doc/admin/database.rst
index 113a680..0eb5ccd 100644
--- a/doc/admin/database.rst
+++ b/doc/admin/database.rst
@@ -483,7 +483,7 @@ availability.  To roll over the master key, follow these steps:
 
     $ kdb5_util list_mkeys
     Master keys for Principal: K/M@KRBTEST.COM
-    KVNO: 1, Enctype: des-cbc-crc, Active on: Wed Dec 31 19:00:00 EST 1969 *
+    KVNO: 1, Enctype: aes256-cts-hmac-sha384-192, Active on: Thu Jan 01 00:00:00 UTC 1970 *
 
 #. On the master KDC, run ``kdb5_util use_mkey 1`` to ensure that a
    master key activation list is present in the database.  This step
diff --git a/doc/admin/install_appl_srv.rst b/doc/admin/install_appl_srv.rst
index 6bae724..6b2d8e4 100644
--- a/doc/admin/install_appl_srv.rst
+++ b/doc/admin/install_appl_srv.rst
@@ -44,18 +44,13 @@ pop, the administrator ``joeadmin`` would issue the command (on
 ``trillium.mit.edu``)::
 
     trillium% kadmin
-    kadmin5: ktadd host/trillium.mit.edu ftp/trillium.mit.edu
-        pop/trillium.mit.edu
-    kadmin: Entry for principal host/trillium.mit.edu@ATHENA.MIT.EDU with
-        kvno 3, encryption type DES-CBC-CRC added to keytab
-        FILE:/etc/krb5.keytab.
-    kadmin: Entry for principal ftp/trillium.mit.edu@ATHENA.MIT.EDU with
-        kvno 3, encryption type DES-CBC-CRC added to keytab
-        FILE:/etc/krb5.keytab.
-    kadmin: Entry for principal pop/trillium.mit.edu@ATHENA.MIT.EDU with
-        kvno 3, encryption type DES-CBC-CRC added to keytab
-        FILE:/etc/krb5.keytab.
-    kadmin5: quit
+    Authenticating as principal root/admin@ATHENA.MIT.EDU with password.
+    Password for root/admin@ATHENA.MIT.EDU:
+    kadmin: ktadd host/trillium.mit.edu ftp/trillium.mit.edu pop/trillium.mit.edu
+    Entry for principal host/trillium.mit.edu@ATHENA.MIT.EDU with kvno 3, encryption type aes256-cts-hmac-sha384-192 added to keytab FILE:/etc/krb5.keytab.
+    kadmin: Entry for principal ftp/trillium.mit.edu@ATHENA.MIT.EDU with kvno 3, encryption type aes256-cts-hmac-sha384-192 added to keytab FILE:/etc/krb5.keytab.
+    kadmin: Entry for principal pop/trillium.mit.edu@ATHENA.MIT.EDU with kvno 3, encryption type aes256-cts-hmac-sha384-192 added to keytab FILE:/etc/krb5.keytab.
+    kadmin: quit
     trillium%
 
 If you generate the keytab file on another host, you need to get a
diff --git a/doc/admin/install_kdc.rst b/doc/admin/install_kdc.rst
index 5d1e70e..3bec59f 100644
--- a/doc/admin/install_kdc.rst
+++ b/doc/admin/install_kdc.rst
@@ -340,7 +340,7 @@ To extract a keytab directly on a replica KDC called
     Entry for principal host/kerberos-1.mit.edu with kvno 2, encryption
         type aes128-cts-hmac-sha1-96 added to keytab FILE:/etc/krb5.keytab.
     Entry for principal host/kerberos-1.mit.edu with kvno 2, encryption
-        type des3-cbc-sha1 added to keytab FILE:/etc/krb5.keytab.
+        type aes256-cts-hmac-sha384-192 added to keytab FILE:/etc/krb5.keytab.
     Entry for principal host/kerberos-1.mit.edu with kvno 2, encryption
         type arcfour-hmac added to keytab FILE:/etc/krb5.keytab.