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

krb5: use new krb5_time_abs() function

Browse Source 
From Apple Heimdal-597.121.1: replace calls to labs() with krb5_time_abs()
This commit is contained in:
Luke Howard
2021-08-09 14:48:04 +10:00
parent 57a1a66348
commit f538f0e5c2
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5/rd_cred.c
View File

@@ -222,7 +222,7 @@ krb5_rd_cred(krb5_context context,
if (enc_krb_cred_part.timestamp == NULL || if (enc_krb_cred_part.timestamp == NULL ||
enc_krb_cred_part.usec == NULL || enc_krb_cred_part.usec == NULL ||
labs(*enc_krb_cred_part.timestamp - sec) krb5_time_abs(*enc_krb_cred_part.timestamp, sec)
> context->max_skew) { > context->max_skew) {
krb5_clear_error_message (context); krb5_clear_error_message (context);
ret = KRB5KRB_AP_ERR_SKEW; ret = KRB5KRB_AP_ERR_SKEW;

2
lib/krb5/rd_priv.c
View File

@@ -136,7 +136,7 @@ krb5_rd_priv(krb5_context context,
krb5_timeofday (context, &sec); krb5_timeofday (context, &sec);
if (part.timestamp == NULL || if (part.timestamp == NULL ||
part.usec == NULL || part.usec == NULL ||
labs(*part.timestamp - sec) > context->max_skew) { krb5_time_abs(*part.timestamp, sec) > context->max_skew) {
krb5_clear_error_message (context); krb5_clear_error_message (context);
ret = KRB5KRB_AP_ERR_SKEW; ret = KRB5KRB_AP_ERR_SKEW;
goto failure_part; goto failure_part;

2
lib/krb5/rd_req.c
View File

@@ -413,7 +413,7 @@ krb5_verify_ap_req2(krb5_context context,
krb5_timeofday (context, &now); krb5_timeofday (context, &now);
if (labs(ac->authenticator->ctime - now) > context->max_skew) { if (krb5_time_abs(ac->authenticator->ctime, now) > context->max_skew) {
ret = KRB5KRB_AP_ERR_SKEW; ret = KRB5KRB_AP_ERR_SKEW;
krb5_clear_error_message (context); krb5_clear_error_message (context);
goto out; goto out;

2
lib/krb5/rd_safe.c
View File

@@ -159,7 +159,7 @@ krb5_rd_safe(krb5_context context,
if (safe.safe_body.timestamp == NULL || if (safe.safe_body.timestamp == NULL ||
safe.safe_body.usec == NULL || safe.safe_body.usec == NULL ||
labs(*safe.safe_body.timestamp - sec) > context->max_skew) { krb5_time_abs(*safe.safe_body.timestamp, sec) > context->max_skew) {
ret = KRB5KRB_AP_ERR_SKEW; ret = KRB5KRB_AP_ERR_SKEW;
krb5_clear_error_message (context); krb5_clear_error_message (context);
goto failure; goto failure;

4
lib/krb5/test_time.c
View File

@@ -54,11 +54,11 @@ check_set_time(krb5_context context)
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_us_timeofday"); krb5_err(context, 1, ret, "krb5_us_timeofday");
diff2 = labs(sec - tv.tv_sec); diff2 = krb5_time_abs(sec, tv.tv_sec);
if (diff2 < 9 || diff > 11) if (diff2 < 9 || diff > 11)
krb5_errx(context, 1, "set time error: diff: %ld", krb5_errx(context, 1, "set time error: diff: %ld",
labs(sec - tv.tv_sec)); krb5_time_abs(sec, tv.tv_sec));
} }

4
lib/krb5/ticket.c
View File

@@ -850,11 +850,11 @@ _krb5_extract_ticket(krb5_context context,
tmp_time = rep->enc_part.authtime; tmp_time = rep->enc_part.authtime;
if (creds->times.starttime == 0 if (creds->times.starttime == 0
&& labs(tmp_time - sec_now) > context->max_skew) { && krb5_time_abs(tmp_time, sec_now) > context->max_skew) {
ret = KRB5KRB_AP_ERR_SKEW; ret = KRB5KRB_AP_ERR_SKEW;
krb5_set_error_message (context, ret, krb5_set_error_message (context, ret,
N_("time skew (%ld) larger than max (%ld)", ""), N_("time skew (%ld) larger than max (%ld)", ""),
labs(tmp_time - sec_now), krb5_time_abs(tmp_time, sec_now),
(long)context->max_skew); (long)context->max_skew);
goto out; goto out;
} }