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

2 files changed, 28 insertions, 35 deletions

diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h
index 2b7410d25..481d6b126 100644
--- a/src/include/k5-int-pkinit.h
+++ b/src/include/k5-int-pkinit.h
@@ -47,7 +47,7 @@ typedef struct _krb5_pk_authenticator {
 /* PKAuthenticator draft9 */
 typedef struct _krb5_pk_authenticator_draft9 {
     krb5_principal  kdcName;
-    krb5_octet_data kdcRealm;
+    krb5_data       kdcRealm;
     krb5_int32      cusec;  /* (0..999999) */
     krb5_timestamp  ctime;
     krb5_int32      nonce;  /* (0..4294967295) */
@@ -55,14 +55,14 @@ typedef struct _krb5_pk_authenticator_draft9 {
 
 /* AlgorithmIdentifier */
 typedef struct _krb5_algorithm_identifier {
-    krb5_octet_data algorithm;      /* OID */
-    krb5_octet_data parameters; /* Optional */
+    krb5_data algorithm;      /* OID */
+    krb5_data parameters; /* Optional */
 } krb5_algorithm_identifier;
 
 /* SubjectPublicKeyInfo */
 typedef struct _krb5_subject_pk_info {
     krb5_algorithm_identifier   algorithm;
-    krb5_octet_data             subjectPublicKey; /* BIT STRING */
+    krb5_data                   subjectPublicKey; /* BIT STRING */
 } krb5_subject_pk_info;
 
 /** AuthPack from RFC 4556*/
@@ -70,8 +70,8 @@ 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; /* OIDs of KDFs; OPTIONAL */
+    krb5_data                   clientDHNonce; /* Optional */
+    krb5_data                   **supportedKDFs; /* OIDs of KDFs; OPTIONAL */
 } krb5_auth_pack;
 
 /* AuthPack draft9 */
@@ -82,9 +82,9 @@ typedef struct _krb5_auth_pack_draft9 {
 
 /* ExternalPrincipalIdentifier */
 typedef struct _krb5_external_principal_identifier {
-    krb5_octet_data subjectName; /* Optional */
-    krb5_octet_data issuerAndSerialNumber; /* Optional */
-    krb5_octet_data subjectKeyIdentifier; /* Optional */
+    krb5_data subjectName; /* Optional */
+    krb5_data issuerAndSerialNumber; /* Optional */
+    krb5_data subjectKeyIdentifier; /* Optional */
 } krb5_external_principal_identifier;
 
 /* TrustedCas */
@@ -97,43 +97,43 @@ typedef struct _krb5_trusted_ca {
     } choice;
     union {
         krb5_principal  principalName;
-        krb5_octet_data caName; /* fully-qualified X.500 "Name" as defined by X.509 (der-encoded) */
-        krb5_octet_data issuerAndSerial; /* Optional -- IssuerAndSerialNumber (der-encoded) */
+        krb5_data caName; /* fully-qualified X.500 "Name" as defined by X.509 (der-encoded) */
+        krb5_data issuerAndSerial; /* Optional -- IssuerAndSerialNumber (der-encoded) */
     } u;
 } krb5_trusted_ca;
 
 /* PA-PK-AS-REQ (Draft 9 -- PA TYPE 14) */
 typedef struct _krb5_pa_pk_as_req_draft9 {
-    krb5_octet_data signedAuthPack;
+    krb5_data signedAuthPack;
     krb5_trusted_ca **trustedCertifiers; /* Optional array */
-    krb5_octet_data kdcCert; /* Optional */
-    krb5_octet_data encryptionCert;
+    krb5_data kdcCert; /* Optional */
+    krb5_data encryptionCert;
 } krb5_pa_pk_as_req_draft9;
 
 /* PA-PK-AS-REQ (rfc4556 -- PA TYPE 16) */
 typedef struct _krb5_pa_pk_as_req {
-    krb5_octet_data signedAuthPack;
+    krb5_data signedAuthPack;
     krb5_external_principal_identifier **trustedCertifiers; /* Optional array */
-    krb5_octet_data kdcPkId; /* Optional */
+    krb5_data kdcPkId; /* Optional */
 } krb5_pa_pk_as_req;
 
 /** 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_data dhSignedData;
+    krb5_data serverDHNonce; /* Optional */
+    krb5_data *kdfID; /* OID of selected KDF OPTIONAL */
 } krb5_dh_rep_info;
 
 /* KDCDHKeyInfo */
 typedef struct _krb5_kdc_dh_key_info {
-    krb5_octet_data subjectPublicKey; /* BIT STRING */
+    krb5_data       subjectPublicKey; /* BIT STRING */
     krb5_int32      nonce;  /* (0..4294967295) */
     krb5_timestamp  dhKeyExpiration; /* Optional */
 } krb5_kdc_dh_key_info;
 
 /* KDCDHKeyInfo draft9*/
 typedef struct _krb5_kdc_dh_key_info_draft9 {
-    krb5_octet_data subjectPublicKey; /* BIT STRING */
+    krb5_data       subjectPublicKey; /* BIT STRING */
     krb5_int32      nonce;  /* (0..4294967295) */
 } krb5_kdc_dh_key_info_draft9;
 
@@ -157,8 +157,8 @@ typedef struct _krb5_pa_pk_as_rep_draft9 {
         choice_pa_pk_as_rep_draft9_encKeyPack = 1
     } choice;
     union {
-        krb5_octet_data dhSignedData;
-        krb5_octet_data encKeyPack;
+        krb5_data dhSignedData;
+        krb5_data encKeyPack;
     } u;
 } krb5_pa_pk_as_rep_draft9;
 
@@ -171,7 +171,7 @@ typedef struct _krb5_pa_pk_as_rep {
     } choice;
     union {
         krb5_dh_rep_info    dh_Info;
-        krb5_octet_data     encKeyPack;
+        krb5_data           encKeyPack;
     } u;
 } krb5_pa_pk_as_rep;
 
@@ -186,8 +186,8 @@ typedef struct _krb5_sp80056a_other_info {
 /* PkinitSuppPubInfo, for pkinit algorithm agility */
 typedef struct _krb5_pkinit_supp_pub_info {
     krb5_enctype      enctype;
-    krb5_octet_data   as_req;
-    krb5_octet_data   pk_as_rep;
+    krb5_data         as_req;
+    krb5_data         pk_as_rep;
 } krb5_pkinit_supp_pub_info;
 
 /*
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 92da68a7e..d5524255e 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -207,6 +207,7 @@ typedef struct _krb5_data {
     char *data;
 } krb5_data;
 
+/* Originally introduced for PKINIT; now unused.  Do not use this. */
 typedef struct _krb5_octet_data {
     krb5_magic magic;
     unsigned int length;
@@ -4651,15 +4652,7 @@ krb5_free_ap_rep_enc_part(krb5_context context, krb5_ap_rep_enc_part *val);
 void KRB5_CALLCONV
 krb5_free_data(krb5_context context, krb5_data *val);
 
-/**
- * Free storage associated with a @c krb5_octet_data structure and its pointer.
- *
- * @param [in] context          Context structure
- * @param [in] val              Data structure to be freed
- *
- * @return
- * None
- */
+/* Free a krb5_octet_data structure (should be unused). */
 void KRB5_CALLCONV
 krb5_free_octet_data(krb5_context context, krb5_octet_data *val);