diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-12-21 22:52:43 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-12-21 22:52:43 +0000 |
| commit | 02fff47a6ff9f322431d8c2d50fa463973ec19fd (patch) | |
| tree | 2d0026af2c9906f6362936e6eee4e29b0fbc5af3 /src/lib/krb5/asn.1/asn1_k_encode.c | |
| parent | 7203dc8cc0ef42d512ad864ce76c6587b447f463 (diff) | |
| download | krb5-02fff47a6ff9f322431d8c2d50fa463973ec19fd.zip krb5-02fff47a6ff9f322431d8c2d50fa463973ec19fd.tar.gz krb5-02fff47a6ff9f322431d8c2d50fa463973ec19fd.tar.bz2 | |
Stop using krb5_octet_data
For consistency with the rest of the code base, make PKINIT use
krb5_data as a pointer/length container. Leave krb5_octet_data and
krb5_free_octet_data behind for API compatibility.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25600 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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 018aae8..351281e 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -1622,15 +1622,15 @@ asn1_error_code asn1_encode_krb5_substructure(asn1buf *buf, #ifndef DISABLE_PKINIT DEFFNXTYPE(algorithm_identifier, krb5_algorithm_identifier, asn1_encode_algorithm_identifier); -DEFFNLENTYPE(object_identifier, asn1_octet *, asn1_encode_oid); -DEFFIELDTYPE(oid_data, krb5_octet_data, - FIELDOF_STRING(krb5_octet_data,object_identifier, data, length, -1)); +DEFFNLENTYPE(object_identifier, char *, asn1_encode_oid); +DEFFIELDTYPE(oid_data, krb5_data, + FIELDOF_STRING(krb5_data, object_identifier, data, length, -1)); DEFPTRTYPE(oid_data_ptr, oid_data); static const struct field_info kdf_alg_id_fields[] = { - FIELDOF_ENCODEAS(krb5_octet_data, oid_data, 0) + FIELDOF_ENCODEAS(krb5_data, oid_data, 0) }; -DEFSEQTYPE(kdf_alg_id, krb5_octet_data, kdf_alg_id_fields, NULL); +DEFSEQTYPE(kdf_alg_id, krb5_data, kdf_alg_id_fields, NULL); DEFPTRTYPE(kdf_alg_id_ptr, kdf_alg_id); DEFNONEMPTYNULLTERMSEQOFTYPE(supported_kdfs, kdf_alg_id_ptr); DEFPTRTYPE(supported_kdfs_ptr, supported_kdfs); @@ -1664,8 +1664,8 @@ DEFSEQTYPE(sp80056a_other_info, krb5_sp80056a_other_info, sp80056a_other_info_fi /* For PkinitSuppPubInfo, for pkinit agility */ static const struct field_info pkinit_supp_pub_info_fields[] = { FIELDOF_NORM(krb5_pkinit_supp_pub_info, int32, enctype, 0), - FIELDOF_STRING(krb5_pkinit_supp_pub_info, octetstring, as_req.data, as_req.length, 1), - FIELDOF_STRING(krb5_pkinit_supp_pub_info, octetstring, pk_as_rep.data, pk_as_rep.length, 2), + FIELDOF_STRING(krb5_pkinit_supp_pub_info, charstring, as_req.data, as_req.length, 1), + FIELDOF_STRING(krb5_pkinit_supp_pub_info, charstring, pk_as_rep.data, pk_as_rep.length, 2), }; DEFSEQTYPE(pkinit_supp_pub_info, krb5_pkinit_supp_pub_info, pkinit_supp_pub_info_fields, NULL); |