2 files changed, 20 insertions, 3 deletions
diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h
index 47e16e1c3..4f22cddb6 100644
--- a/src/include/k5-int-pkinit.h
+++ b/src/include/k5-int-pkinit.h
@@ -65,12 +65,13 @@ typedef struct _krb5_subject_pk_info {
     krb5_octet_data             subjectPublicKey; /* BIT STRING */
 } krb5_subject_pk_info;
 
-/* AuthPack */
+/** AuthPack  from RFC 4556*/
 typedef struct _krb5_auth_pack {
     krb5_pk_authenticator       pkAuthenticator;
     krb5_subject_pk_info        *clientPublicValue; /* Optional */
     krb5_algorithm_identifier   **supportedCMSTypes; /* Optional */
     krb5_octet_data             clientDHNonce; /* Optional */
+krb5_octet_data **supportedKDFs; /*< object identifiers of KDFs; OPTIONAL*/
 } krb5_auth_pack;
 
 /* AuthPack draft9 */
@@ -116,10 +117,11 @@ typedef struct _krb5_pa_pk_as_req {
     krb5_octet_data kdcPkId; /* Optional */
 } krb5_pa_pk_as_req;
 
-/* DHRepInfo */
+/** Pkinit DHRepInfo */
 typedef struct _krb5_dh_rep_info {
     krb5_octet_data dhSignedData;
     krb5_octet_data serverDHNonce; /* Optional */
+    krb5_octet_data *kdfID; /**< OID of selected KDF OPTIONAL*/
 } krb5_dh_rep_info;
 
 /* KDCDHKeyInfo */
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 049bf91f1..5b6f0b9c1 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -4647,7 +4647,22 @@ void KRB5_CALLCONV
 krb5_free_data(krb5_context context, krb5_data *val);
 
 /**
- * Free the contents of a krb_data structure.
+ * @brief Free storage associated with a @c krb5_octet_data structure and its pointer.
+ *
+ * @param context           Context structure [input, output]
+ * @param val               Pointer to data structure to be freed [input, output]
+ *
+ * @return
+ * None
+ */
+void KRB5_CALLCONV
+krb5_free_octet_data(krb5_context context, krb5_octet_data *val);
+
+/**
+ * @brief Free the contents of a @c _krb5_data structure and zero the data field.
+ *
+ * @param context           Context structure [input, output]
+ * @param val               Pointer to data structure to be freed [input, output]
  *
  * @param [in] context          Library context
  * @param [in] val              Data structure to free contents of