tyler.durden/pixiewps
1
0
Fork 0
mirror of https://github.com/wiire-a/pixiewps.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from rofl0r/inline

Browse Source 
Fix inline so -O0 works too
This commit is contained in:
wiire-a 2017-10-08 16:22:31 +02:00 committed by GitHub
commit 6c145761c3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pixiewps.h
View File

@ -218,7 +218,7 @@ char v_usage[] =
"\n"; "\n";
/* One digit comma separated number parsing */ /* One digit comma separated number parsing */
inline uint_fast8_t parse_mode(char *list, uint_fast8_t *dst, const uint8_t max_digit) { static inline uint_fast8_t parse_mode(char *list, uint_fast8_t *dst, const uint8_t max_digit) {
uint_fast8_t cnt = 0; uint_fast8_t cnt = 0;
while (*list != 0) { while (*list != 0) {
if (*list <= ((char) max_digit) + '0') { if (*list <= ((char) max_digit) + '0') {
@ -237,7 +237,7 @@ inline uint_fast8_t parse_mode(char *list, uint_fast8_t *dst, const uint8_t max_
} }
/* Checks if passed mode is selected */ /* Checks if passed mode is selected */
inline uint_fast8_t is_mode_selected(const uint_fast8_t mode) { static inline uint_fast8_t is_mode_selected(const uint_fast8_t mode) {
for (uint_fast8_t i = 0; p_mode[i] != NONE && i < MODE_LEN; i++) { for (uint_fast8_t i = 0; p_mode[i] != NONE && i < MODE_LEN; i++) {
if (p_mode[i] == mode) if (p_mode[i] == mode)
return 1; return 1;

2
src/utils.h
View File

@ -166,7 +166,7 @@ unsigned long get_elapsed_ms(struct timeval *start, struct timeval *end) {
} }
/* Converts an unsigned integer to a char array without termination */ /* Converts an unsigned integer to a char array without termination */
inline void uint_to_char_array(unsigned int num, unsigned int len, uint8_t *dst) { static inline void uint_to_char_array(unsigned int num, unsigned int len, uint8_t *dst) {
unsigned int mul = 1; unsigned int mul = 1;
while (len--) { while (len--) {
dst[len] = (num % (mul * 10) / mul) + '0'; dst[len] = (num % (mul * 10) / mul) + '0';

6
src/wps.h
View File

@ -84,7 +84,7 @@ void kdf(const void *key, uint8_t *res) {
} }
/* Pin checksum computing */ /* Pin checksum computing */
inline uint_fast8_t wps_pin_checksum(uint_fast32_t pin) { static inline uint_fast8_t wps_pin_checksum(uint_fast32_t pin) {
unsigned int acc = 0; unsigned int acc = 0;
while (pin) { while (pin) {
acc += 3 * (pin % 10); acc += 3 * (pin % 10);
@ -96,12 +96,12 @@ inline uint_fast8_t wps_pin_checksum(uint_fast32_t pin) {
} }
/* Validity PIN control based on checksum */ /* Validity PIN control based on checksum */
inline uint_fast8_t wps_pin_valid(uint_fast32_t pin) { static inline uint_fast8_t wps_pin_valid(uint_fast32_t pin) {
return wps_pin_checksum(pin / 10) == (pin % 10); return wps_pin_checksum(pin / 10) == (pin % 10);
} }
/* Checks if PKe == 2 */ /* Checks if PKe == 2 */
inline uint_fast8_t check_small_dh_keys(const uint8_t *data) { static inline uint_fast8_t check_small_dh_keys(const uint8_t *data) {
uint_fast8_t i = WPS_PKEY_LEN - 2; uint_fast8_t i = WPS_PKEY_LEN - 2;
while (--i) { while (--i) {
if (data[i] != 0) if (data[i] != 0)