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

3 files changed, 8 insertions, 21 deletions

diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h
index 481d6b1268..3ad5f51062 100644
--- a/src/include/k5-int-pkinit.h
+++ b/src/include/k5-int-pkinit.h
@@ -230,9 +230,6 @@ encode_krb5_reply_key_pack_draft9(const krb5_reply_key_pack_draft9 *,
                                   krb5_data **code);
 
 krb5_error_code
-encode_krb5_typed_data(const krb5_typed_data **, krb5_data **code);
-
-krb5_error_code
 encode_krb5_td_trusted_certifiers(const krb5_external_principal_identifier **,
                                   krb5_data **code);
 
@@ -286,17 +283,12 @@ decode_krb5_reply_key_pack_draft9(const krb5_data *,
                                   krb5_reply_key_pack_draft9 **);
 
 krb5_error_code
-decode_krb5_typed_data(const krb5_data *, krb5_typed_data ***);
-
-krb5_error_code
 decode_krb5_td_trusted_certifiers(const krb5_data *,
                                   krb5_external_principal_identifier ***);
 
 krb5_error_code
 decode_krb5_td_dh_parameters(const krb5_data *, krb5_algorithm_identifier ***);
 
-void krb5_free_typed_data(krb5_context, krb5_typed_data **);
-
 krb5_error_code
 encode_krb5_enc_data(const krb5_enc_data *, krb5_data **);
 
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index b25c159a75..906fb24ee5 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1677,6 +1677,9 @@ krb5_error_code
 encode_krb5_padata_sequence(krb5_pa_data *const *rep, krb5_data **code);
 
 krb5_error_code
+encode_krb5_typed_data(const krb5_pa_data *const *rep, krb5_data **code);
+
+krb5_error_code
 encode_krb5_alt_method(const krb5_alt_method *, krb5_data **code);
 
 krb5_error_code
@@ -1904,6 +1907,9 @@ krb5_error_code
 decode_krb5_padata_sequence(const krb5_data *output, krb5_pa_data ***rep);
 
 krb5_error_code
+decode_krb5_typed_data(const krb5_data *, krb5_pa_data ***);
+
+krb5_error_code
 decode_krb5_alt_method(const krb5_data *output, krb5_alt_method **rep);
 
 krb5_error_code
@@ -2141,7 +2147,7 @@ void krb5int_free_srv_dns_data(struct srv_dns_entry *);
 /* To keep happy libraries which are (for now) accessing internal stuff */
 
 /* Make sure to increment by one when changing the struct */
-#define KRB5INT_ACCESS_STRUCT_VERSION 18
+#define KRB5INT_ACCESS_STRUCT_VERSION 19
 
 #ifndef ANAME_SZ
 struct ktext;                   /* from krb.h, for krb524 support */
@@ -2225,9 +2231,6 @@ typedef struct _krb5int_access {
                                          krb5_data **code);
 
     krb5_error_code
-    (*encode_krb5_typed_data)(const krb5_typed_data **, krb5_data **code);
-
-    krb5_error_code
     (*decode_krb5_auth_pack)(const krb5_data *, krb5_auth_pack **);
 
     krb5_error_code
@@ -2271,9 +2274,6 @@ typedef struct _krb5int_access {
                                          ***);
 
     krb5_error_code
-    (*decode_krb5_typed_data)(const krb5_data *, krb5_typed_data ***);
-
-    krb5_error_code
     (*decode_krb5_as_req)(const krb5_data *output, krb5_kdc_req **rep);
 
     krb5_error_code
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index d5524255e4..a363eaff42 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1972,12 +1972,7 @@ typedef struct _krb5_pa_data {
     krb5_octet *contents;       /**< Data */
 } krb5_pa_data;
 
-/*
- * The FAST error handling logic currently assumes that pointers to this
- * structure and krb5_pa_data can be safely cast to each other.  If this
- * structure changes, that code needs to be updated to copy.
- */
-/** Typed data */
+/* Don't use this; use krb5_pa_data instead. */
 typedef struct _krb5_typed_data {
     krb5_magic magic;
     krb5_int32 type;