diff options
| author | John Kohl <jtkohl@mit.edu> | 1990-12-19 13:49:02 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1990-12-19 13:49:02 +0000 |
| commit | 925e75f802c25301bdc39d3b48a088e9c13e14a5 (patch) | |
| tree | 78edd52e7caab8d428b5c21dd73e2c2ff3131829 /src/lib | |
| parent | d7fa0e9e6eaf6a212c1464b60ed1f04d81cdcac1 (diff) | |
| download | krb5-925e75f802c25301bdc39d3b48a088e9c13e14a5.tar.gz krb5-925e75f802c25301bdc39d3b48a088e9c13e14a5.tar.xz krb5-925e75f802c25301bdc39d3b48a088e9c13e14a5.zip | |
make a distinction between unencrypted and encrypted authorization data
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1569 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/asn.1/KRB5-asn.py | 2 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/ktgrq2tgrq.c | 4 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/tgrq2ktgrq.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/krb5/asn.1/KRB5-asn.py b/src/lib/krb5/asn.1/KRB5-asn.py index e6a6e2a24..c7d603fe7 100644 --- a/src/lib/krb5/asn.1/KRB5-asn.py +++ b/src/lib/krb5/asn.1/KRB5-asn.py @@ -150,7 +150,7 @@ KDC-REQ-BODY ::= SEQUENCE { nonce[7] INTEGER, etype[8] SEQUENCE OF INTEGER, -- EncryptionType, in preference order addresses[9] HostAddresses OPTIONAL, - authorization-data[10] EncryptedData OPTIONAL, -- AuthorizationData + enc-authorization-data[10] EncryptedData OPTIONAL, -- AuthorizationData additional-tickets[11] SEQUENCE OF Ticket OPTIONAL } diff --git a/src/lib/krb5/asn.1/ktgrq2tgrq.c b/src/lib/krb5/asn.1/ktgrq2tgrq.c index 348074b6c..b4e56ea24 100644 --- a/src/lib/krb5/asn.1/ktgrq2tgrq.c +++ b/src/lib/krb5/asn.1/ktgrq2tgrq.c @@ -105,10 +105,10 @@ register int *error; } } if (val->authorization_data.ciphertext.data) { - retval->authorization__data = + retval->enc__authorization__data = krb5_enc_data2KRB5_EncryptedData(&(val->authorization_data), error); - if (!retval->authorization__data) + if (!retval->enc__authorization__data) goto errout; } if (val->second_ticket) { diff --git a/src/lib/krb5/asn.1/tgrq2ktgrq.c b/src/lib/krb5/asn.1/tgrq2ktgrq.c index e6fcb10d2..53a47c499 100644 --- a/src/lib/krb5/asn.1/tgrq2ktgrq.c +++ b/src/lib/krb5/asn.1/tgrq2ktgrq.c @@ -101,8 +101,8 @@ register int *error; goto errout; } } - if (val->authorization__data) { - temp = KRB5_EncryptedData2krb5_enc_data(val->authorization__data, + if (val->enc__authorization__data) { + temp = KRB5_EncryptedData2krb5_enc_data(val->enc__authorization__data, error); if (temp) { retval->authorization_data = *temp; |