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

try to free memory

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2065 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-08 23:41:51 +00:00
parent 5464d10451
commit 4847270ab2
2 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/krb5/rd_priv.c
View File

@@ -17,11 +17,15 @@ krb5_rd_priv(krb5_context context,
r = decode_KRB_PRIV (inbuf->data, inbuf->length, &priv, &len); r = decode_KRB_PRIV (inbuf->data, inbuf->length, &priv, &len);
if (r) if (r)
return r; goto failure;
if (priv.pvno != 5) if (priv.pvno != 5) {
return KRB5KRB_AP_ERR_BADVERSION; r = KRB5KRB_AP_ERR_BADVERSION;
if (priv.msg_type != krb_safe) goto failure;
return KRB5KRB_AP_ERR_MSG_TYPE; }
if (priv.msg_type != krb_safe) {
r = KRB5KRB_AP_ERR_MSG_TYPE;
goto failure;
}
r = krb5_decrypt (context, r = krb5_decrypt (context,
priv.enc_part.cipher.data, priv.enc_part.cipher.data,
@@ -30,7 +34,7 @@ krb5_rd_priv(krb5_context context,
&auth_context->key, &auth_context->key,
&plain); &plain);
if (r) if (r)
return r; goto failure;
r = decode_EncKrbPrivPart (plain.data, plain.length, &part, &len); r = decode_EncKrbPrivPart (plain.data, plain.length, &part, &len);
if (r) if (r)
@@ -43,8 +47,10 @@ krb5_rd_priv(krb5_context context,
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
if (part.timestamp == NULL || if (part.timestamp == NULL ||
part.usec == NULL || part.usec == NULL ||
*part.timestamp - tv.tv_sec > 600) *part.timestamp - tv.tv_sec > 600) {
return KRB5KRB_AP_ERR_SKEW; r = KRB5KRB_AP_ERR_SKEW;
goto failure_priv;
}
} }
/* XXX - check replay cache */ /* XXX - check replay cache */
@@ -52,13 +58,24 @@ krb5_rd_priv(krb5_context context,
/* check sequence number */ /* check sequence number */
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) { if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
if (part.seq_number == NULL || if (part.seq_number == NULL ||
*part.seq_number != ++auth_context->remote_seqnumber) *part.seq_number != ++auth_context->remote_seqnumber) {
return KRB5KRB_AP_ERR_BADORDER; r = KRB5KRB_AP_ERR_BADORDER;
goto failure_priv;
}
} }
r = krb5_data_copy (outbuf, part.user_data.data, part.user_data.length); r = krb5_data_copy (outbuf, part.user_data.data, part.user_data.length);
if (r) if (r)
return r; goto failure_priv;
free_EncKrbPrivPart (&part);
free_KRB_PRIV (&priv);
return 0; return 0;
failure_priv:
free_EncKrbPrivPart (&part);
failure:
free_KRB_PRIV (&priv);
return r;
} }

54
lib/krb5/rd_safe.c
View File

@@ -15,30 +15,40 @@ krb5_rd_safe(krb5_context context,
r = decode_KRB_SAFE (inbuf->data, inbuf->length, &safe, &len); r = decode_KRB_SAFE (inbuf->data, inbuf->length, &safe, &len);
if (r) if (r)
return r; goto failure;
if (safe.pvno != 5) if (safe.pvno != 5) {
return KRB5KRB_AP_ERR_BADVERSION; r = KRB5KRB_AP_ERR_BADVERSION;
if (safe.msg_type != krb_safe) goto failure;
return KRB5KRB_AP_ERR_MSG_TYPE; }
if (safe.cksum.cksumtype != CKSUMTYPE_RSA_MD4) if (safe.msg_type != krb_safe) {
return KRB5KRB_AP_ERR_INAPP_CKSUM; r = KRB5KRB_AP_ERR_MSG_TYPE;
goto failure;
}
if (safe.cksum.cksumtype != CKSUMTYPE_RSA_MD4) {
r = KRB5KRB_AP_ERR_INAPP_CKSUM;
goto failure;
}
/* check timestamp */ /* check timestamp */
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_TIME) { if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_TIME) {
struct timeval tv; struct timeval tv;
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
if (safe.safe_body.timestamp == NULL || if (safe.safe_body.timestamp == NULL ||
safe.safe_body.usec == NULL || safe.safe_body.usec == NULL ||
*(safe.safe_body.timestamp) - tv.tv_sec > 600) *(safe.safe_body.timestamp) - tv.tv_sec > 600) {
return KRB5KRB_AP_ERR_SKEW; r = KRB5KRB_AP_ERR_SKEW;
goto failure;
}
} }
/* XXX - check replay cache */ /* XXX - check replay cache */
/* check sequence number */ /* check sequence number */
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) { if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
if (safe.safe_body.seq_number == NULL || if (safe.safe_body.seq_number == NULL ||
*safe.safe_body.seq_number != ++auth_context->remote_seqnumber) *safe.safe_body.seq_number != ++auth_context->remote_seqnumber) {
return KRB5KRB_AP_ERR_BADORDER; r = KRB5KRB_AP_ERR_BADORDER;
goto failure;
}
} }
r = krb5_verify_checksum (context, r = krb5_verify_checksum (context,
@@ -46,11 +56,17 @@ krb5_rd_safe(krb5_context context,
safe.safe_body.user_data.length, safe.safe_body.user_data.length,
&safe.cksum); &safe.cksum);
if (r) if (r)
return r; goto failure;
outbuf->length = safe.safe_body.user_data.length; outbuf->length = safe.safe_body.user_data.length;
outbuf->data = malloc(outbuf->length); outbuf->data = malloc(outbuf->length);
if (outbuf->data == NULL) if (outbuf->data == NULL) {
return ENOMEM; r = ENOMEM;
goto failure;
}
memcpy (outbuf->data, safe.safe_body.user_data.data, outbuf->length); memcpy (outbuf->data, safe.safe_body.user_data.data, outbuf->length);
free_KRB_SAFE (&safe);
return 0; return 0;
failure:
free_KRB_SAFE (&safe);
return r;
} }