diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-02-22 03:34:57 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-02-22 03:34:57 +0000 |
| commit | 014a42d0a35adc8503e3b2a7dcefba82abd54152 (patch) | |
| tree | e13e924061c88f5d02b4d2d299d9ca4686c57daa /src/lib | |
| parent | e31c182a5ddbdf21490d18fe308a50d82a7d7453 (diff) | |
| download | krb5-014a42d0a35adc8503e3b2a7dcefba82abd54152.tar.gz krb5-014a42d0a35adc8503e3b2a7dcefba82abd54152.tar.xz krb5-014a42d0a35adc8503e3b2a7dcefba82abd54152.zip | |
Revert broken #7092 fix
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25705 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 2efbf7cd2..5ed17528b 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -173,16 +173,8 @@ DEFNULLTERMSEQOFTYPE(seqof_host_addresses, address_ptr); DEFPTRTYPE(ptr_seqof_host_addresses, seqof_host_addresses); DEFOPTIONALEMPTYTYPE(opt_ptr_seqof_host_addresses, ptr_seqof_host_addresses); -/* - * krb5_kvno is defined as unsigned int, but historically (MIT krb5 through - * 1.6, and through 1.10 in the decoder) we treat it as signed, in violation of - * RFC 4120. kvno values large enough to be problematic are only likely to be - * seen with Windows read-only domain controllers, which overload the high - * 16-bits of kvno values for krbtgt principals. Since Windows encodes kvnos - * as signed 32-bit values, for interoperability it's best if we do the same. - */ DEFFIELD(enc_data_0, krb5_enc_data, enctype, 0, int32); -DEFFIELD(enc_data_1, krb5_enc_data, kvno, 1, opt_int); +DEFFIELD(enc_data_1, krb5_enc_data, kvno, 1, opt_uint); DEFFIELD(enc_data_2, krb5_enc_data, ciphertext, 2, ostring_data); static const struct atype_info *encrypted_data_fields[] = { &k5_atype_enc_data_0, &k5_atype_enc_data_1, &k5_atype_enc_data_2 |