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

(_krb5_mk_req_internal): Indent and remove unused code block.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16798 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-03-19 20:33:13 +00:00
parent 4740e4a03a
commit 5a9da5632c
1 changed files with 87 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
lib/krb5/mk_req_ext.c
View File

@@ -45,125 +45,103 @@ _krb5_mk_req_internal(krb5_context context,
krb5_key_usage checksum_usage, krb5_key_usage checksum_usage,
krb5_key_usage encrypt_usage) krb5_key_usage encrypt_usage)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_data authenticator; krb5_data authenticator;
Checksum c; Checksum c;
Checksum *c_opt; Checksum *c_opt;
krb5_auth_context ac; krb5_auth_context ac;
if(auth_context) { if(auth_context) {
if(*auth_context == NULL) if(*auth_context == NULL)
ret = krb5_auth_con_init(context, auth_context); ret = krb5_auth_con_init(context, auth_context);
else else
ret = 0; ret = 0;
ac = *auth_context; ac = *auth_context;
} else } else
ret = krb5_auth_con_init(context, &ac); ret = krb5_auth_con_init(context, &ac);
if(ret) if(ret)
return ret; return ret;
if(ac->local_subkey == NULL && (ap_req_options & AP_OPTS_USE_SUBKEY)) { if(ac->local_subkey == NULL && (ap_req_options & AP_OPTS_USE_SUBKEY)) {
ret = krb5_auth_con_generatelocalsubkey(context, ac, &in_creds->session); ret = krb5_auth_con_generatelocalsubkey(context,
if(ret) ac,
goto out; &in_creds->session);
} if(ret)
goto out;
}
#if 0 krb5_free_keyblock(context, ac->keyblock);
{ ret = krb5_copy_keyblock(context, &in_creds->session, &ac->keyblock);
/* This is somewhat bogus since we're possibly overwriting a if (ret)
value specified by the user, but it's the easiest way to make goto out;
the code use a compatible enctype */
Ticket ticket;
krb5_keytype ticket_keytype;
ret = decode_Ticket(in_creds->ticket.data,
in_creds->ticket.length,
&ticket,
NULL);
krb5_enctype_to_keytype (context,
ticket.enc_part.etype,
&ticket_keytype);
if (ticket_keytype == in_creds->session.keytype)
krb5_auth_setenctype(context,
ac,
ticket.enc_part.etype);
free_Ticket(&ticket);
}
#endif
krb5_free_keyblock(context, ac->keyblock);
ret = krb5_copy_keyblock(context, &in_creds->session, &ac->keyblock);
if (ret)
goto out;
/* it's unclear what type of checksum we can use. try the best one, except: /* it's unclear what type of checksum we can use. try the best one, except:
* a) if it's configured differently for the current realm, or * a) if it's configured differently for the current realm, or
* b) if the session key is des-cbc-crc * b) if the session key is des-cbc-crc
*/ */
if (in_data) { if (in_data) {
if(ac->keyblock->keytype == ETYPE_DES_CBC_CRC) { if(ac->keyblock->keytype == ETYPE_DES_CBC_CRC) {
/* this is to make DCE secd (and older MIT kdcs?) happy */ /* this is to make DCE secd (and older MIT kdcs?) happy */
ret = krb5_create_checksum(context, ret = krb5_create_checksum(context,
NULL, NULL,
0, 0,
CKSUMTYPE_RSA_MD4, CKSUMTYPE_RSA_MD4,
in_data->data, in_data->data,
in_data->length, in_data->length,
&c); &c);
} else if(ac->keyblock->keytype == ETYPE_ARCFOUR_HMAC_MD5 || } else if(ac->keyblock->keytype == ETYPE_ARCFOUR_HMAC_MD5 ||
ac->keyblock->keytype == ETYPE_ARCFOUR_HMAC_MD5_56) { ac->keyblock->keytype == ETYPE_ARCFOUR_HMAC_MD5_56) {
/* this is to make MS kdc happy */ /* this is to make MS kdc happy */
ret = krb5_create_checksum(context, ret = krb5_create_checksum(context,
NULL, NULL,
0, 0,
CKSUMTYPE_RSA_MD5, CKSUMTYPE_RSA_MD5,
in_data->data, in_data->data,
in_data->length, in_data->length,
&c); &c);
} else { } else {
krb5_crypto crypto; krb5_crypto crypto;
ret = krb5_crypto_init(context, ac->keyblock, 0, &crypto); ret = krb5_crypto_init(context, ac->keyblock, 0, &crypto);
if (ret) if (ret)
goto out; goto out;
ret = krb5_create_checksum(context, ret = krb5_create_checksum(context,
crypto, crypto,
checksum_usage, checksum_usage,
0, 0,
in_data->data, in_data->data,
in_data->length, in_data->length,
&c); &c);
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
} }
c_opt = &c; c_opt = &c;
} else { } else {
c_opt = NULL; c_opt = NULL;
} }
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, NULL,
&authenticator, &authenticator,
encrypt_usage); encrypt_usage);
if (c_opt) if (c_opt)
free_Checksum (c_opt); free_Checksum (c_opt);
if (ret) if (ret)
goto out; goto out;
ret = krb5_build_ap_req (context, ac->keyblock->keytype, ret = krb5_build_ap_req (context, ac->keyblock->keytype,
in_creds, ap_req_options, authenticator, outbuf); in_creds, ap_req_options, authenticator, outbuf);
out: out:
if(auth_context == NULL) if(auth_context == NULL)
krb5_auth_con_free(context, ac); krb5_auth_con_free(context, ac);
return ret; return ret;
} }
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION