X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util.h;h=936ccea816840b36835b5d8eac1af2c847045a79;hb=1f273eda615c04331df6849cfbf3cfad069ea8b0;hp=7299a8b56489954961299250d3d476dde029c9c6;hpb=f80789910cbf6a8b68496783a9203bff3f6a63bd;p=mech_eap.orig diff --git a/util.h b/util.h index 7299a8b..936ccea 100644 --- a/util.h +++ b/util.h @@ -57,10 +57,77 @@ #ifndef _UTIL_H_ #define _UTIL_H_ 1 +#include +#include + #include -#define KRB_KEYTYPE(key) ((key)->enctype) +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef MIN /* Usually found in . */ +#define MIN(_a,_b) ((_a)<(_b)?(_a):(_b)) +#endif + +#define KRB_KEY_TYPE(key) ((key)->enctype) +#define KRB_KEY_DATA(key) ((key)->contents) +#define KRB_KEY_LENGTH(key) ((key)->length) +#define KRB_KEY_INIT(key) do { \ + KRB_KEY_TYPE(key) = ENCTYPE_NULL; \ + KRB_KEY_DATA(key) = NULL; \ + KRB_KEY_LENGTH(key) = 0; \ + } while (0) + +enum gss_eap_token_type { + TOK_TYPE_NONE = 0x0000, /* no token */ + TOK_TYPE_MIC = 0x0404, /* RFC 4121 MIC token */ + TOK_TYPE_WRAP = 0x0504, /* RFC 4121 wrap token */ + TOK_TYPE_EXPORT_NAME = 0x0401, /* RFC 2743 exported name */ + TOK_TYPE_EXPORT_NAME_COMPOSITE = 0x0402, /* draft-ietf-kitten-gss-naming */ + TOK_TYPE_DELETE_CONTEXT = 0x0405, /* RFC 2743 delete context */ + TOK_TYPE_EAP_RESP = 0x0601, /* draft-howlett-eap-gss */ + TOK_TYPE_EAP_REQ = 0x0602, /* draft-howlett-eap-gss */ + TOK_TYPE_GSS_CB = 0x0603, /* draft-howlett-eap-gss */ +}; + +#define EAP_EXPORT_CONTEXT_V1 1 + +/* util_buffer.c */ +OM_uint32 +makeStringBuffer(OM_uint32 *minor, + const char *string, + gss_buffer_t buffer); + +OM_uint32 +bufferToString(OM_uint32 *minor, + const gss_buffer_t buffer, + char **pString); + +OM_uint32 +duplicateBuffer(OM_uint32 *minor, + const gss_buffer_t src, + gss_buffer_t dst); + +static inline int +bufferEqual(const gss_buffer_t b1, const gss_buffer_t b2) +{ + return (b1->length == b2->length && + memcmp(b1->value, b2->value, b2->length) == 0); +} + +static inline int +bufferEqualString(const gss_buffer_t b1, const char *s) +{ + gss_buffer_desc b2; + b2.length = strlen(s); + b2.value = (char *)s; + + return bufferEqual(b1, &b2); +} + +/* util_cksum.c */ int gssEapSign(krb5_context context, krb5_cksumtype type, @@ -80,14 +147,48 @@ gssEapVerify(krb5_context context, int iov_count, int *valid); +#if 0 +OM_uint32 +gssEapEncodeGssChannelBindings(OM_uint32 *minor, + gss_channel_bindings_t chanBindings, + gss_buffer_t encodedBindings); +#endif + /* util_context.c */ OM_uint32 gssEapAllocContext(OM_uint32 *minor, gss_ctx_id_t *pCtx); OM_uint32 gssEapReleaseContext(OM_uint32 *minor, gss_ctx_id_t *pCtx); +OM_uint32 +gssEapMakeToken(OM_uint32 *minor, + gss_ctx_id_t ctx, + const gss_buffer_t innerToken, + enum gss_eap_token_type tokenType, + gss_buffer_t outputToken); + +OM_uint32 +gssEapVerifyToken(OM_uint32 *minor, + gss_ctx_id_t ctx, + const gss_buffer_t inputToken, + enum gss_eap_token_type tokenType, + gss_buffer_t innerInputToken); + /* util_cred.c */ OM_uint32 gssEapAllocCred(OM_uint32 *minor, gss_cred_id_t *pCred); OM_uint32 gssEapReleaseCred(OM_uint32 *minor, gss_cred_id_t *pCred); +OM_uint32 +gssEapAcquireCred(OM_uint32 *minor, + const gss_name_t desiredName, + const gss_buffer_t password, + OM_uint32 timeReq, + const gss_OID_set desiredMechs, + int cred_usage, + gss_cred_id_t *pCred, + gss_OID_set *pActualMechs, + OM_uint32 *timeRec); + +int gssEapCredAvailable(gss_cred_id_t cred, gss_OID mech); + /* util_crypt.c */ int gssEapEncrypt(krb5_context context, int dce_style, size_t ec, @@ -123,8 +224,9 @@ int gssEapAllocIov(gss_iov_buffer_t iov, size_t size); OM_uint32 -gssEapDeriveRFC3961Key(OM_uint32 *minor, - gss_buffer_t msk, +gssEapDeriveRfc3961Key(OM_uint32 *minor, + const unsigned char *key, + size_t keyLength, krb5_enctype enctype, krb5_keyblock *pKey); @@ -132,6 +234,11 @@ gssEapDeriveRFC3961Key(OM_uint32 *minor, OM_uint32 gssEapKerberosInit(OM_uint32 *minor, krb5_context *context); +OM_uint32 +rfc3961ChecksumTypeForKey(OM_uint32 *minor, + krb5_keyblock *key, + krb5_cksumtype *cksumtype); + #define GSSEAP_KRB_INIT(ctx) do { \ OM_uint32 tmpMajor; \ tmpMajor = gssEapKerberosInit(minor, ctx); \ @@ -141,7 +248,7 @@ gssEapKerberosInit(OM_uint32 *minor, krb5_context *context); } while (0) /* util_mech.c */ -void +int gssEapInternalizeOid(const gss_OID oid, gss_OID *const pInternalizedOid); @@ -166,9 +273,51 @@ gssEapOidToEnctype(OM_uint32 *minor, int gssEapIsMechanismOid(const gss_OID oid); +int +gssEapIsConcreteMechanismOid(const gss_OID oid); + +OM_uint32 +gssEapValidateMechs(OM_uint32 *minor, + const gss_OID_set mechs); + /* util_name.c */ +enum gss_eap_attribute_type { + ATTR_TYPE_NONE = 0, + ATTR_TYPE_SAML_AAA_ASSERTION = 1, + ATTR_TYPE_SAML_ATTR = 2, + ATTR_TYPE_RADIUS_AVP = 3 +}; + +typedef OM_uint32 (*gss_eap_add_attr_cb)(OM_uint32 *minor, + gss_name_t name, + gss_buffer_t attribute, + void *data); + OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName); OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName); +OM_uint32 gssEapExportName(OM_uint32 *minor, + const gss_name_t name, + gss_buffer_t exportedName, + int composite); +OM_uint32 gssEapImportName(OM_uint32 *minor, + const gss_buffer_t input_name_buffer, + gss_OID input_name_type, + gss_name_t *output_name); + +enum gss_eap_attribute_type +gssEapAttributePrefixToType(const gss_buffer_t prefix); +gss_buffer_t +gssEapAttributeTypeToPrefix(enum gss_eap_attribute_type type); +OM_uint32 +decomposeAttributeName(OM_uint32 *minor, + const gss_buffer_t attribute, + gss_buffer_t prefix, + gss_buffer_t suffix); +OM_uint32 +composeAttributeName(OM_uint32 *minor, + const gss_buffer_t prefix, + const gss_buffer_t suffix, + gss_buffer_t attribute); /* util_oid.c */ OM_uint32 @@ -185,44 +334,55 @@ decomposeOid(OM_uint32 *minor_status, gss_OID_desc *oid, int *suffix) ; +OM_uint32 +duplicateOid(OM_uint32 *minor_status, + const gss_OID_desc * const oid, + gss_OID *new_oid); + +OM_uint32 +duplicateOidSet(OM_uint32 *minor, + const gss_OID_set src, + gss_OID_set *dst); + static inline int -oidEqual(const gss_OID_desc *o1, const gss_OID_desc *o2) +oidEqual(const gss_OID_desc *o1, const gss_OID_desc *o2) { - return (o1->length == o2->length && - memcmp(o1->elements, o2->elements, o1->length) == 0); + if (o1 == GSS_C_NO_OID) + return (o2 == GSS_C_NO_OID); + else if (o2 == GSS_C_NO_OID) + return (o1 == GSS_C_NO_OID); + else + return (o1->length == o2->length && + memcmp(o1->elements, o2->elements, o1->length) == 0); } /* util_ordering.c */ -int -sequenceInternalize(void **vqueue, unsigned char **buf, size_t *lenremain); +OM_uint32 +sequenceInternalize(OM_uint32 *minor, + void **vqueue, + unsigned char **buf, + size_t *lenremain); -int -sequenceExternalize(void *vqueue, unsigned char **buf, size_t *lenremain); +OM_uint32 +sequenceExternalize(OM_uint32 *minor, + void *vqueue, + unsigned char **buf, + size_t *lenremain); -int -sequenceSize(void *vqueue, size_t *sizep); +size_t +sequenceSize(void *vqueue); -void -sequenceFree(void **vqueue); +OM_uint32 +sequenceFree(OM_uint32 *minor, void **vqueue); -int -sequenceCheck(void **vqueue, uint64_t seqnum); +OM_uint32 +sequenceCheck(OM_uint32 *minor, void **vqueue, uint64_t seqnum); -int -sequenceInit(void **vqueue, uint64_t seqnum, +OM_uint32 +sequenceInit(OM_uint32 *minor, void **vqueue, uint64_t seqnum, int do_replay, int do_sequence, int wide_nums); /* util_token.c */ -enum gss_eap_token_type { - TOK_TYPE_EAP_RESP = 0x0601, - TOK_TYPE_EAP_REQ = 0x0602, - TOK_TYPE_GSS_CB = 0x0603, - TOK_TYPE_MIC = 0x0404, - TOK_TYPE_WRAP = 0x0504, - TOK_TYPE_DELETE = 0x0405, - TOK_TYPE_NONE = 0xFFFF -}; - size_t tokenSize(const gss_OID_desc *mech, size_t body_size); @@ -232,8 +392,9 @@ makeTokenHeader(const gss_OID_desc *mech, unsigned char **buf, enum gss_eap_token_type tok_type); -int -verifyTokenHeader(const gss_OID_desc * mech, +OM_uint32 +verifyTokenHeader(OM_uint32 *minor, + gss_OID mech, size_t *body_size, unsigned char **buf_in, size_t toksize_in, @@ -270,6 +431,9 @@ verifyTokenHeader(const gss_OID_desc * mech, #define GSSEAP_ONCE(o, i) pthread_once((o), (i)) #define GSSEAP_ONCE_INITIALIZER PTHREAD_ONCE_INIT +#include "util_radius.h" +#include "util_saml.h" + /* Helper functions */ static inline void store_uint16_be(uint16_t val, void *vp) @@ -332,23 +496,57 @@ load_uint64_be(const void *cvp) return ((uint64_t)load_uint32_be(p) << 32) | load_uint32_be(p + 4); } -static OM_uint32 -makeStringBuffer(OM_uint32 *minor, - const char *string, - gss_buffer_t buffer) +static inline unsigned char * +store_buffer(gss_buffer_t buffer, void *vp, int wide_nums) +{ + unsigned char *p = (unsigned char *)vp; + + if (wide_nums) { + store_uint64_be(buffer->length, p); + p += 8; + } else { + store_uint32_be(buffer->length, p); + p += 4; + } + + if (buffer->value != NULL) { + memcpy(p, buffer->value, buffer->length); + p += buffer->length; + } + + return p; +} + +static inline unsigned char * +load_buffer(const void *cvp, size_t length, gss_buffer_t buffer) { - size_t len = strlen(string); + buffer->length = 0; + buffer->value = GSSEAP_MALLOC(length); + if (buffer->value == NULL) + return NULL; + buffer->length = length; + memcpy(buffer->value, cvp, length); + return (unsigned char *)cvp + length; +} - buffer->value = GSSEAP_MALLOC(len + 1); - if (buffer->value == NULL) { - *minor = ENOMEM; - return GSS_S_FAILURE; +static inline unsigned char * +store_oid(gss_OID oid, void *vp) +{ + gss_buffer_desc buf; + + if (oid != GSS_C_NO_OID) { + buf.length = oid->length; + buf.value = oid->elements; + } else { + buf.length = 0; + buf.value = NULL; } - memcpy(buffer->value, string, len + 1); - buffer->length = len; - *minor = 0; - return GSS_S_COMPLETE; + return store_buffer(&buf, vp, FALSE); +} + +#ifdef __cplusplus } +#endif #endif /* _UTIL_H_ */