From a52de0d3350721434b1d1548fa2892ce0d770aad Mon Sep 17 00:00:00 2001 From: wiire-a Date: Sat, 23 Dec 2017 20:00:16 +0100 Subject: [PATCH] Cosmetic changes --- src/pixiewps.c | 12 ++++++------ src/utils.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pixiewps.c b/src/pixiewps.c index 866afa9..8c8b798 100644 --- a/src/pixiewps.c +++ b/src/pixiewps.c @@ -778,10 +778,10 @@ usage_err: uint_fast8_t pfound = PIN_ERROR; vtag_t *vtag; if (decrypted5 && decrypted7 && wps->e_hash1 && wps->e_hash2) { - wps->e_s1 = malloc(WPS_SECRET_NONCE_LEN); if (!wps->e_s1) goto memory_err; - wps->e_s2 = malloc(WPS_SECRET_NONCE_LEN); if (!wps->e_s2) goto memory_err; - wps->psk1 = malloc(WPS_HASH_LEN); if (!wps->psk1) goto memory_err; - wps->psk2 = malloc(WPS_HASH_LEN); if (!wps->psk2) goto memory_err; + wps->e_s1 = malloc(WPS_SECRET_NONCE_LEN); if (!wps->e_s1) goto memory_err; + wps->e_s2 = malloc(WPS_SECRET_NONCE_LEN); if (!wps->e_s2) goto memory_err; + wps->psk1 = malloc(WPS_HASH_LEN); if (!wps->psk1) goto memory_err; + wps->psk2 = malloc(WPS_HASH_LEN); if (!wps->psk2) goto memory_err; wps->empty_psk = malloc(WPS_HASH_LEN); if (!wps->empty_psk) goto memory_err; empty_pin_hmac(wps); @@ -1091,8 +1091,8 @@ usage_err: wps->e_s2 = malloc(WPS_SECRET_NONCE_LEN); if (!wps->e_s2) goto memory_err; /* Allocate memory for digests */ - wps->psk1 = malloc(WPS_HASH_LEN); if (!wps->psk1) goto memory_err; - wps->psk2 = malloc(WPS_HASH_LEN); if (!wps->psk2) goto memory_err; + wps->psk1 = malloc(WPS_HASH_LEN); if (!wps->psk1) goto memory_err; + wps->psk2 = malloc(WPS_HASH_LEN); if (!wps->psk2) goto memory_err; wps->empty_psk = malloc(WPS_HASH_LEN); if (!wps->empty_psk) goto memory_err; empty_pin_hmac(wps); diff --git a/src/utils.h b/src/utils.h index 7ac8303..c805d64 100644 --- a/src/utils.h +++ b/src/utils.h @@ -140,18 +140,18 @@ unsigned int bit_revert(unsigned int v) } /* Custom timegm function made by Eric S Raymond */ -time_t c_timegm(register struct tm *t) +time_t c_timegm(struct tm *t) { long year; time_t result; #define MONTHS_PER_YEAR 12 /* Months per calendar year */ - static const int cumdays[MONTHS_PER_YEAR] = + static const int cdays[MONTHS_PER_YEAR] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; year = 1900 + t->tm_year + t->tm_mon / MONTHS_PER_YEAR; - result = (year - 1970) * 365 + cumdays[t->tm_mon % MONTHS_PER_YEAR]; + result = (year - 1970) * 365 + cdays[t->tm_mon % MONTHS_PER_YEAR]; result += (year - 1968) / 4; result -= (year - 1900) / 100; result += (year - 1600) / 400;