X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util.h;h=dd0cb7354fc6fc84258e61f3058082ac348a4cc4;hb=81378d116795fa8a7a56dc8e00c3b2666126682d;hp=42b2ed6a5099561ebab899ff00ddeba6622b109c;hpb=ec09fc1630996e1c5abee64d2a0a9af1e7bf08c7;p=mech_eap.git diff --git a/util.h b/util.h index 42b2ed6..dd0cb73 100644 --- a/util.h +++ b/util.h @@ -57,12 +57,27 @@ #ifndef _UTIL_H_ #define _UTIL_H_ 1 -#include +#include +#include -#include "util_saml.h" -#include "util_radius.h" +#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 */ @@ -76,6 +91,8 @@ enum gss_eap_token_type { TOK_TYPE_GSS_CB = 0x0603, /* draft-howlett-eap-gss */ }; +#define EAP_EXPORT_CONTEXT_V1 1 + /* util_buffer.c */ OM_uint32 makeStringBuffer(OM_uint32 *minor, @@ -92,6 +109,24 @@ 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, @@ -112,6 +147,13 @@ 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); @@ -145,6 +187,8 @@ gssEapAcquireCred(OM_uint32 *minor, 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, @@ -180,7 +224,7 @@ int gssEapAllocIov(gss_iov_buffer_t iov, size_t size); OM_uint32 -gssEapDeriveRFC3961Key(OM_uint32 *minor, +gssEapDeriveRfc3961Key(OM_uint32 *minor, const unsigned char *key, size_t keyLength, krb5_enctype enctype, @@ -190,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); \ @@ -232,13 +281,6 @@ 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 -}; - 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, @@ -250,21 +292,6 @@ OM_uint32 gssEapImportName(OM_uint32 *minor, 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 composeOid(OM_uint32 *minor_status, @@ -303,23 +330,29 @@ oidEqual(const gss_OID_desc *o1, const gss_OID_desc *o2) } /* 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 */ @@ -332,8 +365,9 @@ makeTokenHeader(const gss_OID_desc *mech, unsigned char **buf, enum gss_eap_token_type tok_type); -int -verifyTokenHeader(gss_OID mech, +OM_uint32 +verifyTokenHeader(OM_uint32 *minor, + gss_OID mech, size_t *body_size, unsigned char **buf_in, size_t toksize_in, @@ -432,4 +466,59 @@ load_uint64_be(const void *cvp) return ((uint64_t)load_uint32_be(p) << 32) | load_uint32_be(p + 4); } +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) +{ + 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; +} + +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; + } + + return store_buffer(&buf, vp, FALSE); +} + +#ifdef __cplusplus +} +#endif + +#include "util_attr.h" + #endif /* _UTIL_H_ */