X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_krb.c;h=7143685d5f9e077f4bee12fad87035bc8faebeb0;hb=7db57acddeddad5f96d16288b3776baf6c10c0b1;hp=48c79a479e310965e0ad4ddd67ee199b9801edb2;hpb=646a981cdd5c439b4b4fa5dde8f742a1a2a05b43;p=mech_eap.orig diff --git a/util_krb.c b/util_krb.c index 48c79a4..7143685 100644 --- a/util_krb.c +++ b/util_krb.c @@ -30,6 +30,10 @@ * SUCH DAMAGE. */ +/* + * Kerberos 5 helpers. + */ + #include "gssapiP_eap.h" static GSSEAP_THREAD_ONCE krbContextKeyOnce = GSSEAP_ONCE_INITIALIZER; @@ -73,12 +77,13 @@ gssEapKerberosInit(OM_uint32 *minor, krb5_context *context) } /* - * Derive a key for RFC 4121 use by using the following - * derivation function: + * Derive a key K for RFC 4121 use by using the following + * derivation function (based on RFC 4402); * - * random-to-key(prf(random-to-key([e]msk), "rfc4121-gss-eap")) - * - * where random-to-key and prf are defined in RFC 3961. + * KMSK = random-to-key(MSK) + * Tn = pseudo-random(KMSK, n || "rfc4121-gss-eap") + * L = output key size + * K = truncate(L, T1 || T2 || .. || Tn) */ OM_uint32 gssEapDeriveRfc3961Key(OM_uint32 *minor, @@ -88,7 +93,10 @@ gssEapDeriveRfc3961Key(OM_uint32 *minor, krb5_keyblock *pKey) { krb5_context krbContext; - krb5_data data, ns, t, prfOut; +#ifndef HAVE_HEIMDAL_VERSION + krb5_data data; +#endif + krb5_data ns, t, prfOut; krb5_keyblock kd; krb5_error_code code; size_t randomLength, keyLength, prfLength; @@ -115,9 +123,6 @@ gssEapDeriveRfc3961Key(OM_uint32 *minor, if (code != 0) goto cleanup; - data.length = MIN(inputKeyLength, randomLength); - data.data = (char *)inputKey; - KRB_KEY_DATA(&kd) = GSSEAP_MALLOC(keyLength); if (KRB_KEY_DATA(&kd) == NULL) { code = ENOMEM; @@ -126,7 +131,15 @@ gssEapDeriveRfc3961Key(OM_uint32 *minor, KRB_KEY_LENGTH(&kd) = keyLength; /* Convert MSK into a Kerberos key */ +#ifdef HAVE_HEIMDAL_VERSION + code = krb5_random_to_key(krbContext, encryptionType, inputKey, + MIN(inputKeyLength, randomLength), &kd); +#else + data.length = MIN(inputKeyLength, randomLength); + data.data = (char *)inputKey; + code = krb5_c_random_to_key(krbContext, encryptionType, &data, &kd); +#endif if (code != 0) goto cleanup; @@ -169,7 +182,12 @@ gssEapDeriveRfc3961Key(OM_uint32 *minor, } /* Finally, convert PRF output into a new key which we will return */ +#ifdef HAVE_HEIMDAL_VERSION + code = krb5_random_to_key(krbContext, encryptionType, + prfOut.data, prfOut.length, &kd); +#else code = krb5_c_random_to_key(krbContext, encryptionType, &prfOut, &kd); +#endif if (code != 0) goto cleanup; @@ -231,10 +249,335 @@ rfc3961ChecksumTypeForKey(OM_uint32 *minor, if (*minor != 0) return GSS_S_FAILURE; +#ifdef HAVE_HEIMDAL_VERSION + *cksumtype = cksum.cksumtype; +#else *cksumtype = cksum.checksum_type; +#endif krb5_free_checksum_contents(krbContext, &cksum); #endif /* HAVE_KRB5INT_C_MANDATORY_CKSUMTYPE */ + if (!krb5_c_is_keyed_cksum(*cksumtype)) { + *minor = KRB5KRB_AP_ERR_INAPP_CKSUM; + return GSS_S_FAILURE; + } + return GSS_S_COMPLETE; } + +#ifdef HAVE_HEIMDAL_VERSION +static heim_general_string krbAnonymousPrincipalComponents[] = + { KRB5_WELLKNOWN_NAME, KRB5_ANON_NAME }; + +static const Principal krbAnonymousPrincipalData = { + { KRB5_NT_WELLKNOWN, { 2, krbAnonymousPrincipalComponents } }, + "WELLKNOWN:ANONYMOUS" +}; +#endif + +krb5_const_principal +krbAnonymousPrincipal(void) +{ +#ifdef HAVE_HEIMDAL_VERSION + return &krbAnonymousPrincipalData; +#else + return krb5_anonymous_principal(); +#endif +} + +krb5_error_code +krbCryptoLength(krb5_context krbContext, +#ifdef HAVE_HEIMDAL_VERSION + krb5_crypto krbCrypto, +#else + krb5_keyblock *key, +#endif + int type, + size_t *length) +{ +#ifdef HAVE_HEIMDAL_VERSION + return krb5_crypto_length(krbContext, krbCrypto, type, length); +#else + unsigned int len; + krb5_error_code code; + + code = krb5_c_crypto_length(krbContext, KRB_KEY_TYPE(key), type, &len); + if (code == 0) + *length = (size_t)len; + + return code; +#endif +} + +krb5_error_code +krbPaddingLength(krb5_context krbContext, +#ifdef HAVE_HEIMDAL_VERSION + krb5_crypto krbCrypto, +#else + krb5_keyblock *key, +#endif + size_t dataLength, + size_t *padLength) +{ + krb5_error_code code; +#ifdef HAVE_HEIMDAL_VERSION + size_t headerLength, paddingLength; + + code = krbCryptoLength(krbContext, krbCrypto, + KRB5_CRYPTO_TYPE_HEADER, &headerLength); + if (code != 0) + return code; + + dataLength += headerLength; + + code = krb5_crypto_length(krbContext, krbCrypto, + KRB5_CRYPTO_TYPE_PADDING, &paddingLength); + if (code != 0) + return code; + + if (paddingLength != 0 && (dataLength % paddingLength) != 0) + *padLength = paddingLength - (dataLength % paddingLength); + else + *padLength = 0; + + return 0; +#else + unsigned int pad; + + code = krb5_c_padding_length(krbContext, KRB_KEY_TYPE(key), dataLength, &pad); + if (code == 0) + *padLength = (size_t)pad; + + return code; +#endif /* HAVE_HEIMDAL_VERSION */ +} + +krb5_error_code +krbBlockSize(krb5_context krbContext, +#ifdef HAVE_HEIMDAL_VERSION + krb5_crypto krbCrypto, +#else + krb5_keyblock *key, +#endif + size_t *blockSize) +{ +#ifdef HAVE_HEIMDAL_VERSION + return krb5_crypto_getblocksize(krbContext, krbCrypto, blockSize); +#else + return krb5_c_block_size(krbContext, KRB_KEY_TYPE(key), blockSize); +#endif +} + +krb5_error_code +krbEnctypeToString(krb5_context krbContext, + krb5_enctype enctype, + const char *prefix, + gss_buffer_t string) +{ + krb5_error_code code; +#ifdef HAVE_HEIMDAL_VERSION + char *enctypeBuf = NULL; +#else + char enctypeBuf[128]; +#endif + size_t prefixLength, enctypeLength; + +#ifdef HAVE_HEIMDAL_VERSION + code = krb5_enctype_to_string(krbContext, enctype, &enctypeBuf); +#else + code = krb5_enctype_to_name(enctype, 0, enctypeBuf, sizeof(enctypeBuf)); +#endif + if (code != 0) + return code; + + prefixLength = (prefix != NULL) ? strlen(prefix) : 0; + enctypeLength = strlen(enctypeBuf); + + string->value = GSSEAP_MALLOC(prefixLength + enctypeLength + 1); + if (string->value == NULL) { +#ifdef HAVE_HEIMDAL_VERSION + krb5_xfree(enctypeBuf); +#endif + return ENOMEM; + } + + if (prefixLength != 0) + memcpy(string->value, prefix, prefixLength); + memcpy((char *)string->value + prefixLength, enctypeBuf, enctypeLength); + + string->length = prefixLength + enctypeLength; + ((char *)string->value)[string->length] = '\0'; + +#ifdef HAVE_HEIMDAL_VERSION + krb5_xfree(enctypeBuf); +#endif + + return 0; +} + +krb5_error_code +krbMakeAuthDataKdcIssued(krb5_context context, + const krb5_keyblock *key, + krb5_const_principal issuer, +#ifdef HAVE_HEIMDAL_VERSION + const AuthorizationData *authdata, + AuthorizationData *adKdcIssued +#else + krb5_authdata *const *authdata, + krb5_authdata ***adKdcIssued +#endif + ) +{ +#ifdef HAVE_HEIMDAL_VERSION + krb5_error_code code; + AD_KDCIssued kdcIssued; + AuthorizationDataElement adDatum; + unsigned char *buf; + size_t buf_size, len; + krb5_crypto crypto = NULL; + + memset(&kdcIssued, 0, sizeof(kdcIssued)); + memset(adKdcIssued, 0, sizeof(*adKdcIssued)); + + kdcIssued.i_realm = issuer->realm != NULL ? (Realm *)&issuer->realm : NULL; + kdcIssued.i_sname = (PrincipalName *)&issuer->name; + kdcIssued.elements = *authdata; + + ASN1_MALLOC_ENCODE(AuthorizationData, buf, buf_size, authdata, &len, code); + if (code != 0) + goto cleanup; + + code = krb5_crypto_init(context, key, 0, &crypto); + if (code != 0) + goto cleanup; + + code = krb5_create_checksum(context, crypto, KRB5_KU_AD_KDC_ISSUED, + 0, buf, buf_size, &kdcIssued.ad_checksum); + if (code != 0) + goto cleanup; + + GSSEAP_FREE(buf); + buf = NULL; + + ASN1_MALLOC_ENCODE(AD_KDCIssued, buf, buf_size, &kdcIssued, &len, code); + if (code != 0) + goto cleanup; + + adDatum.ad_type = KRB5_AUTHDATA_KDC_ISSUED; + adDatum.ad_data.length = buf_size; + adDatum.ad_data.data = buf; + + code = add_AuthorizationData(adKdcIssued, &adDatum); + if (code != 0) + goto cleanup; + +cleanup: + if (buf != NULL) + GSSEAP_FREE(buf); + if (crypto != NULL) + krb5_crypto_destroy(context, crypto); + free_Checksum(&kdcIssued.ad_checksum); + + return code; +#else + return krb5_make_authdata_kdc_issued(context, key, issuer, authdata, + adKdcIssued); +#endif /* HAVE_HEIMDAL_VERSION */ +} + +krb5_error_code +krbMakeCred(krb5_context krbContext, + krb5_auth_context authContext, + krb5_creds *creds, + krb5_data *data) +{ + krb5_error_code code; +#ifdef HAVE_HEIMDAL_VERSION + KRB_CRED krbCred; + KrbCredInfo krbCredInfo; + krb5_keyblock *key; + krb5_crypto krbCrypto = NULL; + krb5_data credInfoData = { 0 }; + size_t len; +#else + krb5_data *d = NULL; +#endif + + memset(data, 0, sizeof(*data)); +#ifdef HAVE_HEIMDAL_VERSION + memset(&krbCred, 0, sizeof(krbCred)); + memset(&krbCredInfo, 0, sizeof(krbCredInfo)); + + key = (authContext->local_subkey != NULL) + ? authContext->local_subkey + : authContext->keyblock; + + krbCred.pvno = 5; + krbCred.msg_type = krb_cred; + krbCred.tickets.val = (Ticket *)GSSEAP_CALLOC(1, sizeof(Ticket)); + if (krbCred.tickets.val == NULL) { + code = ENOMEM; + goto cleanup; + } + krbCred.tickets.len = 1; + + code = decode_Ticket(creds->ticket.data, + creds->ticket.length, + krbCred.tickets.val, &len); + if (code != 0) + goto cleanup; + + krbCredInfo.key = creds->session; + krbCredInfo.prealm = &creds->client->realm; + krbCredInfo.pname = &creds->client->name; + krbCredInfo.flags = &creds->flags.b; + krbCredInfo.authtime = &creds->times.authtime; + krbCredInfo.starttime = &creds->times.starttime; + krbCredInfo.endtime = &creds->times.endtime; + krbCredInfo.renew_till = &creds->times.renew_till; + krbCredInfo.srealm = &creds->server->realm; + krbCredInfo.sname = &creds->server->name; + krbCredInfo.caddr = creds->addresses.len ? &creds->addresses : NULL; + + ASN1_MALLOC_ENCODE(KrbCredInfo, credInfoData.data, credInfoData.length, + &krbCredInfo, &len, code); + if (code != 0) + goto cleanup; + + code = krb5_crypto_init(krbContext, key, 0, &krbCrypto); + if (code != 0) + goto cleanup; + + code = krb5_encrypt_EncryptedData(krbContext, + krbCrypto, + KRB5_KU_KRB_CRED, + credInfoData.data, + credInfoData.length, + 0, + &krbCred.enc_part); + if (code != 0) + goto cleanup; + + ASN1_MALLOC_ENCODE(KRB_CRED, data->data, data->length, + &krbCred, &len, code); + if (code != 0) + goto cleanup; + +cleanup: + if (krbCrypto != NULL) + krb5_crypto_destroy(krbContext, krbCrypto); + free_KRB_CRED(&krbCred); + krb5_data_free(&credInfoData); + + return code; +#else + code = krb5_mk_1cred(krbContext, authContext, creds, &d, NULL); + if (code == 0) { + *data = *d; + GSSEAP_FREE(d); + } + + return code; +#endif /* HAVE_HEIMDAL_VERSION */ +}