oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Simplify krb5_build_authenticator and unexport

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-10-05 19:52:28 -07:00
parent cc65dc4e8e
commit a132ffe757
4 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/gssapi/krb5/init_sec_context.c
View File

@@ -614,7 +614,6 @@ init_auth_restart
enctype, enctype,
ctx->kcred, ctx->kcred,
&cksum, &cksum,
NULL,
&authenticator, &authenticator,
KRB5_KU_AP_REQ_AUTH); KRB5_KU_AP_REQ_AUTH);

63
lib/krb5/build_auth.c
View File

@@ -100,35 +100,30 @@ make_etypelist(krb5_context context,
} }
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_build_authenticator (krb5_context context, _krb5_build_authenticator(krb5_context context,
krb5_auth_context auth_context, krb5_auth_context auth_context,
krb5_enctype enctype, krb5_enctype enctype,
krb5_creds *cred, krb5_creds *cred,
Checksum *cksum, Checksum *cksum,
Authenticator **auth_result,
krb5_data *result, krb5_data *result,
krb5_key_usage usage) krb5_key_usage usage)
{ {
Authenticator *auth; Authenticator auth;
u_char *buf = NULL; u_char *buf = NULL;
size_t buf_size; size_t buf_size;
size_t len; size_t len;
krb5_error_code ret; krb5_error_code ret;
krb5_crypto crypto; krb5_crypto crypto;
auth = calloc(1, sizeof(*auth)); memset(&auth, 0, sizeof(auth));
if (auth == NULL) {
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
auth->authenticator_vno = 5; auth.authenticator_vno = 5;
copy_Realm(&cred->client->realm, &auth->crealm); copy_Realm(&cred->client->realm, &auth.crealm);
copy_PrincipalName(&cred->client->name, &auth->cname); copy_PrincipalName(&cred->client->name, &auth.cname);
krb5_us_timeofday (context, &auth->ctime, &auth->cusec); krb5_us_timeofday (context, &auth.ctime, &auth.cusec);
ret = krb5_auth_con_getlocalsubkey(context, auth_context, &auth->subkey); ret = krb5_auth_con_getlocalsubkey(context, auth_context, &auth.subkey);
if(ret) if(ret)
goto fail; goto fail;
@@ -137,32 +132,32 @@ krb5_build_authenticator (krb5_context context,
krb5_generate_seq_number (context, krb5_generate_seq_number (context,
&cred->session, &cred->session,
&auth_context->local_seqnumber); &auth_context->local_seqnumber);
ALLOC(auth->seq_number, 1); ALLOC(auth.seq_number, 1);
if(auth->seq_number == NULL) { if(auth.seq_number == NULL) {
ret = ENOMEM; ret = ENOMEM;
goto fail; goto fail;
} }
*auth->seq_number = auth_context->local_seqnumber; *auth.seq_number = auth_context->local_seqnumber;
} else } else
auth->seq_number = NULL; auth.seq_number = NULL;
auth->authorization_data = NULL; auth.authorization_data = NULL;
if (cksum) { if (cksum) {
ALLOC(auth->cksum, 1); ALLOC(auth.cksum, 1);
if (auth->cksum == NULL) { if (auth.cksum == NULL) {
ret = ENOMEM; ret = ENOMEM;
goto fail; goto fail;
} }
ret = copy_Checksum(cksum, auth->cksum); ret = copy_Checksum(cksum, auth.cksum);
if (ret) if (ret)
goto fail; goto fail;
if (auth->cksum->cksumtype == CKSUMTYPE_GSSAPI) { if (auth.cksum->cksumtype == CKSUMTYPE_GSSAPI) {
/* /*
* This is not GSS-API specific, we only enable it for * This is not GSS-API specific, we only enable it for
* GSS for now * GSS for now
*/ */
ret = make_etypelist(context, &auth->authorization_data); ret = make_etypelist(context, &auth.authorization_data);
if (ret) if (ret)
goto fail; goto fail;
} }
@@ -170,10 +165,10 @@ krb5_build_authenticator (krb5_context context,
/* XXX - Copy more to auth_context? */ /* XXX - Copy more to auth_context? */
auth_context->authenticator->ctime = auth->ctime; auth_context->authenticator->ctime = auth.ctime;
auth_context->authenticator->cusec = auth->cusec; auth_context->authenticator->cusec = auth.cusec;
ASN1_MALLOC_ENCODE(Authenticator, buf, buf_size, auth, &len, ret); ASN1_MALLOC_ENCODE(Authenticator, buf, buf_size, &auth, &len, ret);
if (ret) if (ret)
goto fail; goto fail;
if(buf_size != len) if(buf_size != len)
@@ -185,7 +180,7 @@ krb5_build_authenticator (krb5_context context,
ret = krb5_encrypt (context, ret = krb5_encrypt (context,
crypto, crypto,
usage /* KRB5_KU_AP_REQ_AUTH */, usage /* KRB5_KU_AP_REQ_AUTH */,
buf + buf_size - len, buf,
len, len,
result); result);
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
@@ -193,19 +188,9 @@ krb5_build_authenticator (krb5_context context,
if (ret) if (ret)
goto fail; goto fail;
fail:
free_Authenticator (&auth);
free (buf); free (buf);
if (auth_result)
*auth_result = auth;
else {
/* Don't free the `cksum', it's allocated by the caller */
free_Authenticator (auth);
free (auth);
}
return ret;
fail:
free_Authenticator (auth);
free (auth);
free (buf);
return ret; return ret;
} }

3
lib/krb5/mk_req_ext.c
View File

@@ -123,12 +123,11 @@ _krb5_mk_req_internal(krb5_context context,
if (ret) if (ret)
goto out; goto out;
ret = krb5_build_authenticator (context, ret = _krb5_build_authenticator(context,
ac, ac,
ac->keyblock->keytype, ac->keyblock->keytype,
in_creds, in_creds,
c_opt, c_opt,
NULL,
&authenticator, &authenticator,
encrypt_usage); encrypt_usage);
if (c_opt) if (c_opt)

2
lib/krb5/version-script.map
View File

@@ -56,7 +56,6 @@ HEIMDAL_KRB5_2.0 {
krb5_auth_con_setuserkey; krb5_auth_con_setuserkey;
krb5_auth_getremoteseqnumber; krb5_auth_getremoteseqnumber;
krb5_build_ap_req; krb5_build_ap_req;
krb5_build_authenticator;
krb5_build_principal; krb5_build_principal;
krb5_build_principal_ext; krb5_build_principal_ext;
krb5_build_principal_va; krb5_build_principal_va;
@@ -709,6 +708,7 @@ HEIMDAL_KRB5_2.0 {
_krb5_crc_init_table; _krb5_crc_init_table;
_krb5_crc_update; _krb5_crc_update;
_krb5_get_krbtgt; _krb5_get_krbtgt;
_krb5_build_authenticator;
# V4 compat glue # V4 compat glue
_krb5_krb_tf_setup; _krb5_krb_tf_setup;