diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-12-21 22:52:52 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-12-21 22:52:52 +0000 |
| commit | edc26c35049615ec634979738ca4d3e3759e9ad8 (patch) | |
| tree | ab48defdbe3cc321cf4d4b4948dc771d2e2bcbb9 /src/plugins | |
| parent | 02fff47a6ff9f322431d8c2d50fa463973ec19fd (diff) | |
| download | krb5-edc26c35049615ec634979738ca4d3e3759e9ad8.tar.gz krb5-edc26c35049615ec634979738ca4d3e3759e9ad8.tar.xz krb5-edc26c35049615ec634979738ca4d3e3759e9ad8.zip | |
Stop using krb5_typed_data structure type
Use the krb5_pa_data structure type when encoding or decoding
TYPED-DATA. Leave the krb5_typed_data structure definition in krb5.h
with a comment saying not to use it. Remove krb5_free_typed_data
(which was never declared in krb5.h). Remove some vestigial accessor
stuff related to PKINIT encoding and decoding TYPED-DATA, which was
unneeded since r25483. Bump the accessor structure version to 19
accordingly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25601 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit.h | 1 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_accessor.c | 2 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_accessor.h | 1 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_lib.c | 13 |
4 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h index 7970746d9..8c75f1fd7 100644 --- a/src/plugins/preauth/pkinit/pkinit.h +++ b/src/plugins/preauth/pkinit/pkinit.h @@ -317,7 +317,6 @@ void free_krb5_pa_pk_as_rep(krb5_pa_pk_as_rep **in); void free_krb5_pa_pk_as_rep_draft9(krb5_pa_pk_as_rep_draft9 **in); void free_krb5_external_principal_identifier(krb5_external_principal_identifier ***in); void free_krb5_trusted_ca(krb5_trusted_ca ***in); -void free_krb5_typed_data(krb5_typed_data ***in); void free_krb5_algorithm_identifiers(krb5_algorithm_identifier ***in); void free_krb5_algorithm_identifier(krb5_algorithm_identifier *in); void free_krb5_kdc_dh_key_info(krb5_kdc_dh_key_info **in); diff --git a/src/plugins/preauth/pkinit/pkinit_accessor.c b/src/plugins/preauth/pkinit/pkinit_accessor.c index acfbde624..cf8a2f530 100644 --- a/src/plugins/preauth/pkinit/pkinit_accessor.c +++ b/src/plugins/preauth/pkinit/pkinit_accessor.c @@ -49,7 +49,6 @@ DEF_FUNC_PTRS(krb5_pa_pk_as_req); DEF_FUNC_PTRS(krb5_pa_pk_as_req_draft9); DEF_FUNC_PTRS(krb5_reply_key_pack); DEF_FUNC_PTRS(krb5_reply_key_pack_draft9); -DEF_FUNC_PTRS_ARRAY(krb5_typed_data); /* special cases... */ krb5_error_code @@ -116,7 +115,6 @@ pkinit_accessor_init(void) SET_PTRS(krb5_reply_key_pack_draft9); SET_PTRS(krb5_td_dh_parameters); SET_PTRS(krb5_td_trusted_certifiers); - SET_PTRS(krb5_typed_data); /* special cases... */ k5int_decode_krb5_principal_name = k5int.decode_krb5_principal_name; diff --git a/src/plugins/preauth/pkinit/pkinit_accessor.h b/src/plugins/preauth/pkinit/pkinit_accessor.h index ba82533c8..df40ab9eb 100644 --- a/src/plugins/preauth/pkinit/pkinit_accessor.h +++ b/src/plugins/preauth/pkinit/pkinit_accessor.h @@ -53,7 +53,6 @@ DEF_EXT_FUNC_PTRS(krb5_pa_pk_as_req); DEF_EXT_FUNC_PTRS(krb5_pa_pk_as_req_draft9); DEF_EXT_FUNC_PTRS(krb5_reply_key_pack); DEF_EXT_FUNC_PTRS(krb5_reply_key_pack_draft9); -DEF_EXT_FUNC_PTRS_ARRAY(krb5_typed_data); /* special cases... */ extern krb5_error_code (*k5int_decode_krb5_principal_name) diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c index 34416142e..50ee044a7 100644 --- a/src/plugins/preauth/pkinit/pkinit_lib.c +++ b/src/plugins/preauth/pkinit/pkinit_lib.c @@ -247,19 +247,6 @@ free_krb5_trusted_ca(krb5_trusted_ca ***in) } void -free_krb5_typed_data(krb5_typed_data ***in) -{ - int i = 0; - if (*in == NULL) return; - while ((*in)[i] != NULL) { - free((*in)[i]->data); - free((*in)[i]); - i++; - } - free(*in); -} - -void free_krb5_algorithm_identifier(krb5_algorithm_identifier *in) { if (in == NULL) |
