diff options
| -rw-r--r-- | lib/libotputil/lcore.c | 14 | ||||
| -rw-r--r-- | lib/libotputil/libotputil.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libotputil/lcore.c b/lib/libotputil/lcore.c index 940f944..8b79e26 100644 --- a/lib/libotputil/lcore.c +++ b/lib/libotputil/lcore.c | |||
| @@ -78,7 +78,7 @@ const otputil_t otputil_const_defaults = | |||
| 78 | { | 78 | { |
| 79 | // general options | 79 | // general options |
| 80 | .util_desc = NULL, | 80 | .util_desc = NULL, |
| 81 | .otp_method = OTPUTIL_DFLT_METH, | 81 | .util_method = OTPUTIL_DFLT_METH, |
| 82 | // HOTP options | 82 | // HOTP options |
| 83 | .hotp_k = &otputil_const_defaults_k, | 83 | .hotp_k = &otputil_const_defaults_k, |
| 84 | .hotp_c = OTPUTIL_DFLT_HOTP_C, | 84 | .hotp_c = OTPUTIL_DFLT_HOTP_C, |
| @@ -99,7 +99,7 @@ otputil_t otputil_defaults = | |||
| 99 | { | 99 | { |
| 100 | // general options | 100 | // general options |
| 101 | .util_desc = NULL, | 101 | .util_desc = NULL, |
| 102 | .otp_method = OTPUTIL_DFLT_METH, | 102 | .util_method = OTPUTIL_DFLT_METH, |
| 103 | // HOTP options | 103 | // HOTP options |
| 104 | .hotp_k = NULL, | 104 | .hotp_k = NULL, |
| 105 | .hotp_c = OTPUTIL_DFLT_HOTP_C, | 105 | .hotp_c = OTPUTIL_DFLT_HOTP_C, |
| @@ -185,7 +185,7 @@ otputil_get_param( | |||
| 185 | return(OTPUTIL_SUCCESS); | 185 | return(OTPUTIL_SUCCESS); |
| 186 | 186 | ||
| 187 | case OTPUTIL_OPT_METHOD: | 187 | case OTPUTIL_OPT_METHOD: |
| 188 | *((int *)outvalue) = (int)tud->otp_method; | 188 | *((int *)outvalue) = (int)tud->util_method; |
| 189 | return(OTPUTIL_SUCCESS); | 189 | return(OTPUTIL_SUCCESS); |
| 190 | 190 | ||
| 191 | //////////////////////////// | 191 | //////////////////////////// |
| @@ -390,7 +390,7 @@ otputil_set_param( | |||
| 390 | return(OTPUTIL_SUCCESS); | 390 | return(OTPUTIL_SUCCESS); |
| 391 | 391 | ||
| 392 | case OTPUTIL_OPT_METHOD: | 392 | case OTPUTIL_OPT_METHOD: |
| 393 | tud->otp_method = (int32_t)_SET_INPUT_NUM(int, defaults->otp_method); | 393 | tud->util_method = (int32_t)_SET_INPUT_NUM(int, defaults->util_method); |
| 394 | return(OTPUTIL_SUCCESS); | 394 | return(OTPUTIL_SUCCESS); |
| 395 | 395 | ||
| 396 | //////////////////////////// | 396 | //////////////////////////// |
| @@ -513,7 +513,7 @@ otputil_code( | |||
| 513 | 513 | ||
| 514 | tud = ((tud)) ? tud : &otputil_defaults; | 514 | tud = ((tud)) ? tud : &otputil_defaults; |
| 515 | 515 | ||
| 516 | switch(tud->otp_method) | 516 | switch(tud->util_method) |
| 517 | { | 517 | { |
| 518 | case OTPUTIL_METH_HOTP: | 518 | case OTPUTIL_METH_HOTP: |
| 519 | dflt_bv = ((tud->hotp_k)) ? tud->hotp_k : otputil_defaults.hotp_k; | 519 | dflt_bv = ((tud->hotp_k)) ? tud->hotp_k : otputil_defaults.hotp_k; |
| @@ -549,7 +549,7 @@ otputil_str( | |||
| 549 | if ((code = otputil_code(tud)) == -1) | 549 | if ((code = otputil_code(tud)) == -1) |
| 550 | return(NULL); | 550 | return(NULL); |
| 551 | 551 | ||
| 552 | switch(tud->otp_method) | 552 | switch(tud->util_method) |
| 553 | { | 553 | { |
| 554 | case OTPUTIL_METH_HOTP: return(otputil_code2str(code, (int)tud->hotp_digits, dst, dstlen)); | 554 | case OTPUTIL_METH_HOTP: return(otputil_code2str(code, (int)tud->hotp_digits, dst, dstlen)); |
| 555 | case OTPUTIL_METH_TOTP: return(otputil_code2str(code, (int)tud->totp_digits, dst, dstlen)); | 555 | case OTPUTIL_METH_TOTP: return(otputil_code2str(code, (int)tud->totp_digits, dst, dstlen)); |
| @@ -564,7 +564,7 @@ otputil_timer( | |||
| 564 | otputil_t * tud ) | 564 | otputil_t * tud ) |
| 565 | { | 565 | { |
| 566 | tud = ((tud)) ? tud : &otputil_defaults; | 566 | tud = ((tud)) ? tud : &otputil_defaults; |
| 567 | switch(tud->otp_method) | 567 | switch(tud->util_method) |
| 568 | { | 568 | { |
| 569 | case OTPUTIL_METH_TOTP: return(otputil_totp_timer(tud->totp_t0, tud->totp_tx, tud->totp_time)); | 569 | case OTPUTIL_METH_TOTP: return(otputil_totp_timer(tud->totp_t0, tud->totp_tx, tud->totp_time)); |
| 570 | default: break; | 570 | default: break; |
diff --git a/lib/libotputil/libotputil.h b/lib/libotputil/libotputil.h index d92d804..78a7d32 100644 --- a/lib/libotputil/libotputil.h +++ b/lib/libotputil/libotputil.h | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | // k:c:0:hmac:desc | 73 | // k:c:0:hmac:desc |
| 74 | struct _otputil_secret | 74 | struct _otputil_secret |
| 75 | { | 75 | { |
| 76 | int32_t otp_method; | 76 | int32_t util_method; |
| 77 | int8_t hotp_digits; | 77 | int8_t hotp_digits; |
| 78 | int8_t hotp_hmac; | 78 | int8_t hotp_hmac; |
| 79 | int8_t totp_digits; | 79 | int8_t totp_digits; |
