diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-11-14 17:09:23 -0500 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-11-14 17:14:04 -0500 |
| commit | d380f21727f837590bbd22caf16dedfdf02f8a0b (patch) | |
| tree | 0bfa527b150df09424a3e8bc65e0ee5885edec92 /src/man | |
| parent | 8f27ae9d0afb81f851ff56523882de3524031b9b (diff) | |
| download | krb5-d380f21727f837590bbd22caf16dedfdf02f8a0b.tar.gz krb5-d380f21727f837590bbd22caf16dedfdf02f8a0b.tar.xz krb5-d380f21727f837590bbd22caf16dedfdf02f8a0b.zip | |
Rebuild krb5.conf.man for default enctypes
Now that the Camellia enctypes are in the default lists for
permitted_enctypes, default_tkt_enctypes, and default_tgs_enctypes,
regenerate the man page to reflect that change.
ticket: 7446
target_version: 1.11
tags: pullup
Diffstat (limited to 'src/man')
| -rw-r--r-- | src/man/krb5.conf.man | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man index 07021eb0df..9dba5c4503 100644 --- a/src/man/krb5.conf.man +++ b/src/man/krb5.conf.man @@ -240,7 +240,7 @@ should be returned by the KDC, in order of preference from highest to lowest. The list may be delimited with commas or whitespace. See \fIEncryption_and_salt_types\fP in \fIkdc.conf(5)\fP for a list of the accepted values for this tag. -The default value is \fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types +The default value is \fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 camellia256\-cts\-cmac camellia128\-cts\-cmac des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types will be implicitly removed from this list if the value of \fBallow_weak_crypto\fP is false. .TP @@ -249,7 +249,7 @@ Identifies the supported list of session key encryption types that should be requested by the client, in order of preference from highest to lowest. The format is the same as for default_tgs_enctypes. The default value for this tag is -\fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types will be implicitly +\fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 camellia256\-cts\-cmac camellia128\-cts\-cmac des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types will be implicitly removed from this list if the value of \fBallow_weak_crypto\fP is false. .TP @@ -395,7 +395,7 @@ used across NATs. The default value is true. .B \fBpermitted_enctypes\fP Identifies all encryption types that are permitted for use in session key encryption. The default value for this tag is -\fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types will be implicitly +\fBaes256\-cts\-hmac\-sha1\-96 aes128\-cts\-hmac\-sha1\-96 des3\-cbc\-sha1 arcfour\-hmac\-md5 camellia256\-cts\-cmac camellia128\-cts\-cmac des\-cbc\-crc des\-cbc\-md5 des\-cbc\-md4\fP, but single\-DES encryption types will be implicitly removed from this list if the value of \fBallow_weak_crypto\fP is false. .TP |