[29336] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix keytab file format description
daemon@ATHENA.MIT.EDU (Greg Hudson)
Tue Mar 22 13:38:13 2016
Date: Tue, 22 Mar 2016 13:38:09 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201603221738.u2MHc98i029201@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/841cabb2bd0275f0aad739fc03aaa2b66a617f68
commit 841cabb2bd0275f0aad739fc03aaa2b66a617f68
Author: Greg Hudson <ghudson@mit.edu>
Date: Fri Mar 18 17:50:02 2016 -0400
Fix keytab file format description
The key length and count of principal components are 16-bit fields.
ticket: 8385 (new)
target_version: 1.14-next
tags: pullup
doc/formats/keytab_file_format.rst | 4 ++--
src/lib/krb5/keytab/kt_file.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/formats/keytab_file_format.rst b/doc/formats/keytab_file_format.rst
index 92f3733..8424d05 100644
--- a/doc/formats/keytab_file_format.rst
+++ b/doc/formats/keytab_file_format.rst
@@ -29,12 +29,12 @@ the key entry. Key entries use the following informal grammar::
timestamp (32 bits)
key version (8 bits)
enctype (16 bits)
- key length (32 bits)
+ key length (16 bits)
key contents
key version (32 bits) [in release 1.14 and later]
principal ::=
- count of components (32 bits) [includes realm in version 1]
+ count of components (16 bits) [includes realm in version 1]
realm (data)
component1 (data)
component2 (data)
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
index 03fd4c3..6a42f26 100644
--- a/src/lib/krb5/keytab/kt_file.c
+++ b/src/lib/krb5/keytab/kt_file.c
@@ -1001,7 +1001,7 @@ const krb5_kt_ops krb5_kt_dfl_ops = {
* sizeof(krb5_int32) bytes for the timestamp
* sizeof(krb5_octet) bytes for the key version number
* sizeof(krb5_int16) bytes for the enctype
- * sizeof(krb5_int32) bytes for the key length, followed by the key
+ * sizeof(krb5_int16) bytes for the key length, followed by the key
*/
#ifndef SEEK_SET
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
