diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-04-30 21:22:48 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-04-30 21:22:48 +0000 |
commit | baea9a7a27d781581505f0bb6d0ac4e4f24053aa (patch) | |
tree | af04244ed8b910bed378296d0b263c5f2b3a3ffc /src/lib/krb5/asn.1/asn1_k_encode.c | |
parent | d20d802b8e44178017fd1a1da55a72194f50da55 (diff) | |
download | krb5-baea9a7a27d781581505f0bb6d0ac4e4f24053aa.zip krb5-baea9a7a27d781581505f0bb6d0ac4e4f24053aa.tar.gz krb5-baea9a7a27d781581505f0bb6d0ac4e4f24053aa.tar.bz2 |
Add IAKERB mechanism and gss_acquire_cred_with_password
Merge branches/iakerb to trunk. Includes the following:
* New IAKERB mechanism.
* New gss_acquire_cred_with_password mechglue function.
* ASN.1 encoders and decoders for IAKERB structures (with tests).
* New shortcuts in gss-sample client and server.
* Tests to exercise SPNEGO and IAKERB using gss-sample application.
ticket: 6712
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23960 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/asn.1/asn1_k_encode.c')
-rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index a35f561..d334ae6 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -1394,6 +1394,35 @@ static unsigned int ad_signedpath_optional(const void *p) DEFSEQTYPE(ad_signedpath, krb5_ad_signedpath, ad_signedpath_fields, ad_signedpath_optional); +static const struct field_info iakerb_header_fields[] = { + FIELDOF_NORM(krb5_iakerb_header, ostring_data, target_realm, 1), + FIELDOF_OPT(krb5_iakerb_header, ostring_data_ptr, cookie, 2, 2), +}; + +static unsigned int iakerb_header_optional(const void *p) +{ + unsigned int optional = 0; + const krb5_iakerb_header *val = p; + if (val->cookie && val->cookie->data) + optional |= (1u << 2); + return optional; +} + +DEFSEQTYPE(iakerb_header, krb5_iakerb_header, iakerb_header_fields, iakerb_header_optional); + +static const struct field_info iakerb_finished_fields[] = { + FIELDOF_NORM(krb5_iakerb_finished, checksum, checksum, 1), +}; + +static unsigned int iakerb_finished_optional(const void *p) +{ + unsigned int optional = 0; + return optional; +} + +DEFSEQTYPE(iakerb_finished, krb5_iakerb_finished, iakerb_finished_fields, +iakerb_finished_optional); + /* Exported complete encoders -- these produce a krb5_data with the encoding in the correct byte order. */ @@ -1472,6 +1501,8 @@ MAKE_FULL_ENCODER(encode_krb5_fast_response, fast_response); MAKE_FULL_ENCODER(encode_krb5_ad_kdcissued, ad_kdc_issued); MAKE_FULL_ENCODER(encode_krb5_ad_signedpath_data, ad_signedpath_data); MAKE_FULL_ENCODER(encode_krb5_ad_signedpath, ad_signedpath); +MAKE_FULL_ENCODER(encode_krb5_iakerb_header, iakerb_header); +MAKE_FULL_ENCODER(encode_krb5_iakerb_finished, iakerb_finished); |