free allocated storage; reported by Howard Chu
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11564 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -40,61 +40,60 @@ krb5_mk_rep(krb5_context context,
|
|||||||
krb5_auth_context auth_context,
|
krb5_auth_context auth_context,
|
||||||
krb5_data *outbuf)
|
krb5_data *outbuf)
|
||||||
{
|
{
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
AP_REP ap;
|
AP_REP ap;
|
||||||
EncAPRepPart body;
|
EncAPRepPart body;
|
||||||
u_char *buf = NULL;
|
u_char *buf = NULL;
|
||||||
size_t buf_size;
|
size_t buf_size;
|
||||||
size_t len;
|
size_t len;
|
||||||
krb5_crypto crypto;
|
krb5_crypto crypto;
|
||||||
|
|
||||||
ap.pvno = 5;
|
ap.pvno = 5;
|
||||||
ap.msg_type = krb_ap_rep;
|
ap.msg_type = krb_ap_rep;
|
||||||
|
|
||||||
memset (&body, 0, sizeof(body));
|
memset (&body, 0, sizeof(body));
|
||||||
|
|
||||||
body.ctime = auth_context->authenticator->ctime;
|
body.ctime = auth_context->authenticator->ctime;
|
||||||
body.cusec = auth_context->authenticator->cusec;
|
body.cusec = auth_context->authenticator->cusec;
|
||||||
body.subkey = NULL;
|
body.subkey = NULL;
|
||||||
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
||||||
krb5_generate_seq_number (context,
|
krb5_generate_seq_number (context,
|
||||||
auth_context->keyblock,
|
auth_context->keyblock,
|
||||||
&auth_context->local_seqnumber);
|
&auth_context->local_seqnumber);
|
||||||
body.seq_number = malloc (sizeof(*body.seq_number));
|
body.seq_number = malloc (sizeof(*body.seq_number));
|
||||||
if (body.seq_number == NULL) {
|
if (body.seq_number == NULL) {
|
||||||
krb5_set_error_string (context, "malloc: out of memory");
|
krb5_set_error_string (context, "malloc: out of memory");
|
||||||
return ENOMEM;
|
return ENOMEM;
|
||||||
|
}
|
||||||
|
*(body.seq_number) = auth_context->local_seqnumber;
|
||||||
|
} else
|
||||||
|
body.seq_number = NULL;
|
||||||
|
|
||||||
|
ap.enc_part.etype = auth_context->keyblock->keytype;
|
||||||
|
ap.enc_part.kvno = NULL;
|
||||||
|
|
||||||
|
ASN1_MALLOC_ENCODE(EncAPRepPart, buf, buf_size, &body, &len, ret);
|
||||||
|
free_EncAPRepPart (&body);
|
||||||
|
if(ret)
|
||||||
|
return ret;
|
||||||
|
ret = krb5_crypto_init(context, auth_context->keyblock,
|
||||||
|
0 /* ap.enc_part.etype */, &crypto);
|
||||||
|
if (ret) {
|
||||||
|
free (buf);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
*(body.seq_number) = auth_context->local_seqnumber;
|
ret = krb5_encrypt (context,
|
||||||
} else
|
crypto,
|
||||||
body.seq_number = NULL;
|
KRB5_KU_AP_REQ_ENC_PART,
|
||||||
|
buf + buf_size - len,
|
||||||
|
len,
|
||||||
|
&ap.enc_part.cipher);
|
||||||
|
krb5_crypto_destroy(context, crypto);
|
||||||
|
free(buf);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
ap.enc_part.etype = auth_context->keyblock->keytype;
|
ASN1_MALLOC_ENCODE(AP_REP, outbuf->data, outbuf->length, &ap, &len, ret);
|
||||||
ap.enc_part.kvno = NULL;
|
free_AP_REP (&ap);
|
||||||
|
return ret;
|
||||||
ASN1_MALLOC_ENCODE(EncAPRepPart, buf, buf_size, &body, &len, ret);
|
|
||||||
free_EncAPRepPart (&body);
|
|
||||||
if(ret)
|
|
||||||
return ret;
|
|
||||||
ret = krb5_crypto_init(context, auth_context->keyblock,
|
|
||||||
0 /* ap.enc_part.etype */, &crypto);
|
|
||||||
if (ret) {
|
|
||||||
free (buf);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
ret = krb5_encrypt (context,
|
|
||||||
crypto,
|
|
||||||
KRB5_KU_AP_REQ_ENC_PART,
|
|
||||||
buf + buf_size - len,
|
|
||||||
len,
|
|
||||||
&ap.enc_part.cipher);
|
|
||||||
krb5_crypto_destroy(context, crypto);
|
|
||||||
if (ret) {
|
|
||||||
free(buf);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ASN1_MALLOC_ENCODE(AP_REP, outbuf->data, outbuf->length, &ap, &len, ret);
|
|
||||||
free_AP_REP (&ap);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user