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

Fix warnings (clang 3.6)

Browse Source
This commit is contained in:
Nicolas Williams
2016-02-19 22:18:29 -06:00
parent dbf9750989
commit b4cf4de807
21 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdc/digest.c
View File

@@ -608,7 +608,7 @@ _kdc_do_digest(krb5_context context,
} }
t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
if (abs((kdc_time & 0xffffffff) - t) > context->max_skew) { if (labs((kdc_time & 0xffffffff) - t) > context->max_skew) {
ret = EINVAL; ret = EINVAL;
krb5_set_error_message(context, ret, "time screw in server nonce "); krb5_set_error_message(context, ret, "time screw in server nonce ");
goto out; goto out;

8
kdc/kerberos5.c
View File

@@ -516,7 +516,7 @@ pa_enc_chal_validate(kdc_request_t r, const PA_DATA *pa)
continue; continue;
} }
if (abs(kdc_time - p.patimestamp) > r->context->max_skew) { if (labs(kdc_time - p.patimestamp) > r->context->max_skew) {
char client_time[100]; char client_time[100];
krb5_crypto_destroy(r->context, challangecrypto); krb5_crypto_destroy(r->context, challangecrypto);
@@ -528,7 +528,7 @@ pa_enc_chal_validate(kdc_request_t r, const PA_DATA *pa)
_kdc_r_log(r, 0, "Too large time skew, " _kdc_r_log(r, 0, "Too large time skew, "
"client time %s is out by %u > %u seconds -- %s", "client time %s is out by %u > %u seconds -- %s",
client_time, client_time,
(unsigned)abs(kdc_time - p.patimestamp), (unsigned)labs(kdc_time - p.patimestamp),
r->context->max_skew, r->context->max_skew,
r->client_name); r->client_name);
@@ -680,7 +680,7 @@ pa_enc_ts_validate(kdc_request_t r, const PA_DATA *pa)
r->client_name); r->client_name);
goto out; goto out;
} }
if (abs(kdc_time - p.patimestamp) > r->context->max_skew) { if (labs(kdc_time - p.patimestamp) > r->context->max_skew) {
char client_time[100]; char client_time[100];
krb5_format_time(r->context, p.patimestamp, krb5_format_time(r->context, p.patimestamp,
@@ -690,7 +690,7 @@ pa_enc_ts_validate(kdc_request_t r, const PA_DATA *pa)
_kdc_r_log(r, 0, "Too large time skew, " _kdc_r_log(r, 0, "Too large time skew, "
"client time %s is out by %u > %u seconds -- %s", "client time %s is out by %u > %u seconds -- %s",
client_time, client_time,
(unsigned)abs(kdc_time - p.patimestamp), (unsigned)labs(kdc_time - p.patimestamp),
r->context->max_skew, r->context->max_skew,
r->client_name); r->client_name);

4
kdc/pkinit.c
View File

@@ -101,7 +101,7 @@ pk_check_pkauthenticator_win2k(krb5_context context,
krb5_timeofday (context, &now); krb5_timeofday (context, &now);
/* XXX cusec */ /* XXX cusec */
if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) { if (a->ctime == 0 || labs(a->ctime - now) > context->max_skew) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
return KRB5KRB_AP_ERR_SKEW; return KRB5KRB_AP_ERR_SKEW;
} }
@@ -123,7 +123,7 @@ pk_check_pkauthenticator(krb5_context context,
krb5_timeofday (context, &now); krb5_timeofday (context, &now);
/* XXX cusec */ /* XXX cusec */
if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) { if (a->ctime == 0 || labs(a->ctime - now) > context->max_skew) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
return KRB5KRB_AP_ERR_SKEW; return KRB5KRB_AP_ERR_SKEW;
} }

4
kuser/kinit.c
View File

@@ -709,7 +709,7 @@ get_new_tickets(krb5_context context,
} }
if (ticket_life != 0) { if (ticket_life != 0) {
if (abs(cred.times.endtime - cred.times.starttime - ticket_life) > 30) { if (labs(cred.times.endtime - cred.times.starttime - ticket_life) > 30) {
char life[64]; char life[64];
unparse_time_approx(cred.times.endtime - cred.times.starttime, unparse_time_approx(cred.times.endtime - cred.times.starttime,
life, sizeof(life)); life, sizeof(life));
@@ -717,7 +717,7 @@ get_new_tickets(krb5_context context,
} }
} }
if (renew_life) { if (renew_life) {
if (abs(cred.times.renew_till - cred.times.starttime - renew) > 30) { if (labs(cred.times.renew_till - cred.times.starttime - renew) > 30) {
char life[64]; char life[64];
unparse_time_approx(cred.times.renew_till - cred.times.starttime, unparse_time_approx(cred.times.renew_till - cred.times.starttime,
life, sizeof(life)); life, sizeof(life));

4
lib/hcrypto/libtommath/bn_mp_rand.c
View File

@@ -29,7 +29,7 @@ mp_rand (mp_int * a, int digits)
/* first place a random non-zero digit */ /* first place a random non-zero digit */
do { do {
d = ((mp_digit) abs (rand ())) & MP_MASK; d = ((mp_digit) labs (rand ())) & MP_MASK;
} while (d == 0); } while (d == 0);
if ((res = mp_add_d (a, d, a)) != MP_OKAY) { if ((res = mp_add_d (a, d, a)) != MP_OKAY) {
@@ -41,7 +41,7 @@ mp_rand (mp_int * a, int digits)
return res; return res;
} }
if ((res = mp_add_d (a, ((mp_digit) abs (rand ())), a)) != MP_OKAY) { if ((res = mp_add_d (a, ((mp_digit) labs (rand ())), a)) != MP_OKAY) {
return res; return res;
} }
} }

6
lib/hcrypto/libtommath/demo/demo.c
View File

@@ -83,7 +83,7 @@ int main(void)
// now test a random reduction // now test a random reduction
for (ix = 0; ix < 100; ix++) { for (ix = 0; ix < 100; ix++) {
mp_rand(&c, 1 + abs(rand()) % (2*i)); mp_rand(&c, 1 + labs(rand()) % (2*i));
mp_copy(&c, &d); mp_copy(&c, &d);
mp_copy(&c, &e); mp_copy(&c, &e);
@@ -286,7 +286,7 @@ printf("compare no compare!\n"); exit(EXIT_FAILURE); }
if (!(++cnt & 127)) if (!(++cnt & 127))
printf("%9d\r", cnt); printf("%9d\r", cnt);
mp_rand(&a, abs(rand()) % 128 + 1); mp_rand(&a, labs(rand()) % 128 + 1);
mp_div(&a, &d, &b, &e); mp_div(&a, &d, &b, &e);
mp_div_3(&a, &c, &r2); mp_div_3(&a, &c, &r2);
@@ -394,7 +394,7 @@ printf("compare no compare!\n"); exit(EXIT_FAILURE); }
for (;;) { for (;;) {
/* randomly clear and re-init one variable, this has the affect of triming the alloc space */ /* randomly clear and re-init one variable, this has the affect of triming the alloc space */
switch (abs(rand()) % 7) { switch (labs(rand()) % 7) {
case 0: case 0:
mp_clear(&a); mp_clear(&a);
mp_init(&a); mp_init(&a);

2
lib/hcrypto/libtommath/etc/pprime.c
View File

@@ -163,7 +163,7 @@ mp_digit prime_digit(void)
int n; int n;
mp_digit d; mp_digit d;
n = abs(rand()) % n_prime; n = labs(rand()) % n_prime;
fseek(primes, n * sizeof(mp_digit), SEEK_SET); fseek(primes, n * sizeof(mp_digit), SEEK_SET);
fread(&d, 1, sizeof(mp_digit), primes); fread(&d, 1, sizeof(mp_digit), primes);
return d; return d;

2
lib/hcrypto/libtommath/mtest/mpi.c
View File

@@ -492,7 +492,7 @@ void mp_set(mp_int *mp, mp_digit d)
mp_err mp_set_int(mp_int *mp, long z) mp_err mp_set_int(mp_int *mp, long z)
{ {
int ix; int ix;
unsigned long v = abs(z); unsigned long v = labs(z);
mp_err res; mp_err res;
ARGCHK(mp != NULL, MP_BADARG); ARGCHK(mp != NULL, MP_BADARG);

4
lib/hcrypto/libtommath/mtest/mtest.c
View File

@@ -281,7 +281,7 @@ int main(void)
printf("%s\n", buf); printf("%s\n", buf);
} else if (n == 13) { } else if (n == 13) {
rand_num2(&a); rand_num2(&a);
tmp = abs(rand()) & THE_MASK; tmp = labs(rand()) & THE_MASK;
mp_add_d(&a, tmp, &b); mp_add_d(&a, tmp, &b);
printf("add_d\n"); printf("add_d\n");
mp_to64(&a, buf); mp_to64(&a, buf);
@@ -290,7 +290,7 @@ int main(void)
printf("%s\n", buf); printf("%s\n", buf);
} else if (n == 14) { } else if (n == 14) {
rand_num2(&a); rand_num2(&a);
tmp = abs(rand()) & THE_MASK; tmp = labs(rand()) & THE_MASK;
mp_sub_d(&a, tmp, &b); mp_sub_d(&a, tmp, &b);
printf("sub_d\n"); printf("sub_d\n");
mp_to64(&a, buf); mp_to64(&a, buf);

2
lib/hcrypto/libtommath/tommath.src
View File

@@ -19,7 +19,7 @@
\def\gcd{{\rm gcd}} \def\gcd{{\rm gcd}}
\def\log{{\rm log}} \def\log{{\rm log}}
\def\ord{{\rm ord}} \def\ord{{\rm ord}}
\def\abs{{\mathit abs}} \def\labs{{\mathit labs}}
\def\rep{{\mathit rep}} \def\rep{{\mathit rep}}
\def\mod{{\mathit\ mod\ }} \def\mod{{\mathit\ mod\ }}
\renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})} \renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})}

2
lib/hcrypto/libtommath/tommath.tex
View File

@@ -19,7 +19,7 @@
\def\gcd{{\rm gcd}} \def\gcd{{\rm gcd}}
\def\log{{\rm log}} \def\log{{\rm log}}
\def\ord{{\rm ord}} \def\ord{{\rm ord}}
\def\abs{{\mathit abs}} \def\labs{{\mathit labs}}
\def\rep{{\mathit rep}} \def\rep{{\mathit rep}}
\def\mod{{\mathit\ mod\ }} \def\mod{{\mathit\ mod\ }}
\renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})} \renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})}

4
lib/krb5/init_creds_pw.c
View File

@@ -346,7 +346,7 @@ krb5_process_last_request(krb5_context context,
for (i = 0; i < lr->len; ++i) { for (i = 0; i < lr->len; ++i) {
if (lr->val[i].lr_value <= t) { if (lr->val[i].lr_value <= t) {
switch (abs(lr->val[i].lr_type)) { switch (lr->val[i].lr_type) {
case LR_PW_EXPTIME : case LR_PW_EXPTIME :
report_expiration(context, ctx->prompter, report_expiration(context, ctx->prompter,
ctx->prompter_data, ctx->prompter_data,
@@ -361,6 +361,8 @@ krb5_process_last_request(krb5_context context,
lr->val[i].lr_value); lr->val[i].lr_value);
reported = TRUE; reported = TRUE;
break; break;
default:
break;
} }
} }
} }

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 ||
abs(*enc_krb_cred_part.timestamp - sec) labs(*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 ||
abs(*part.timestamp - sec) > context->max_skew) { labs(*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

@@ -409,7 +409,7 @@ krb5_verify_ap_req2(krb5_context context,
krb5_timeofday (context, &now); krb5_timeofday (context, &now);
if (abs(ac->authenticator->ctime - now) > context->max_skew) { if (labs(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 ||
abs(*safe.safe_body.timestamp - sec) > context->max_skew) { labs(*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;

6
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 = abs(sec - tv.tv_sec); diff2 = labs(sec - tv.tv_sec);
if (diff2 < 9 || diff > 11) if (diff2 < 9 || diff > 11)
krb5_errx(context, 1, "set time error: diff: %d", krb5_errx(context, 1, "set time error: diff: %ld",
abs(sec - tv.tv_sec)); labs(sec - tv.tv_sec));
} }

8
lib/krb5/ticket.c
View File

@@ -768,12 +768,12 @@ _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
&& abs(tmp_time - sec_now) > context->max_skew) { && labs(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 (%d) larger than max (%d)", ""), N_("time skew (%ld) larger than max (%ld)", ""),
abs(tmp_time - sec_now), labs(tmp_time - sec_now),
(int)context->max_skew); (long)context->max_skew);
goto out; goto out;
} }

2
lib/libedit/src/readline.c
View File

@@ -1619,7 +1619,7 @@ history_search_prefix(const char *str, int direction)
/* /*
* search for event in history containing str, starting at offset * search for event in history containing str, starting at offset
* abs(pos); continue backward, if pos<0, forward otherwise * labs(pos); continue backward, if pos<0, forward otherwise
*/ */
/* ARGSUSED */ /* ARGSUSED */
int int

2
lib/ntlm/ntlm.c
View File

@@ -1777,7 +1777,7 @@ verify_ntlm2(const void *key, size_t len,
authtime = heim_ntlm_ts2unixtime(t); authtime = heim_ntlm_ts2unixtime(t);
if (abs((int)(authtime - now)) > authtimediff) { if (labs((int)(authtime - now)) > authtimediff) {
ret = HNTLM_ERR_TIME_SKEW; ret = HNTLM_ERR_TIME_SKEW;
goto out; goto out;
} }

2
lib/roken/getcap.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: getcap.c,v 1.29 1999/03/29 09:27:29 abs Exp $ */ /* $NetBSD: getcap.c,v 1.29 1999/03/29 09:27:29 labs Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993