diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:35:10 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-09-19 00:35:10 +0000 |
| commit | 27a69f059a3c57ac7c0c415cfb59656ff3803365 (patch) | |
| tree | 602f40b8e76b719469fe9a9072755b55ef9d0f2d /src/include | |
| parent | 864d4b2669d6e4a798314f28530613a8721491a2 (diff) | |
| download | krb5-27a69f059a3c57ac7c0c415cfb59656ff3803365.tar.gz krb5-27a69f059a3c57ac7c0c415cfb59656ff3803365.tar.xz krb5-27a69f059a3c57ac7c0c415cfb59656ff3803365.zip | |
* Extend auth_pack
* extend dh_rep
* add krb5_free_octet_data
* extend pkinit free functions
pkinit: add supportedKDFs and kdfID to structures
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25194 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int-pkinit.h | 6 | ||||
| -rw-r--r-- | src/include/krb5/krb5.hin | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h index 47e16e1c34..4f22cddb66 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 049bf91f10..5b6f0b9c1e 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 |