aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2023-01-12 12:26:59 -0900
committerDavid M. Syzdek <david@syzdek.net>2023-01-12 12:26:59 -0900
commit523adc3911a9b2fa07b442bb33ba0ffd40ffd2b1 (patch)
tree1da3cf19046b7b826cd67c262f20f18f99725bb2
parent81f5b7bb4e96639ea635d98f622f4e38b53bb0c6 (diff)
downloadotputils-523adc3911a9b2fa07b442bb33ba0ffd40ffd2b1.tar.gz
otputils-523adc3911a9b2fa07b442bb33ba0ffd40ffd2b1.tar.bz2
otputils-523adc3911a9b2fa07b442bb33ba0ffd40ffd2b1.tar.xz
otputils-523adc3911a9b2fa07b442bb33ba0ffd40ffd2b1.zip
libotputil: renaming member otp_desc to util_desc in 'struct _otputil_secret'
-rw-r--r--lib/libotputil/lcore.c20
-rw-r--r--lib/libotputil/libotputil.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/libotputil/lcore.c b/lib/libotputil/lcore.c
index f5e1117..940f944 100644
--- a/lib/libotputil/lcore.c
+++ b/lib/libotputil/lcore.c
@@ -77,7 +77,7 @@ otputil_bv_t otputil_const_defaults_k =
77const otputil_t otputil_const_defaults = 77const otputil_t otputil_const_defaults =
78{ 78{
79 // general options 79 // general options
80 .otp_desc = NULL, 80 .util_desc = NULL,
81 .otp_method = OTPUTIL_DFLT_METH, 81 .otp_method = OTPUTIL_DFLT_METH,
82 // HOTP options 82 // HOTP options
83 .hotp_k = &otputil_const_defaults_k, 83 .hotp_k = &otputil_const_defaults_k,
@@ -98,7 +98,7 @@ const otputil_t otputil_const_defaults =
98otputil_t otputil_defaults = 98otputil_t otputil_defaults =
99{ 99{
100 // general options 100 // general options
101 .otp_desc = NULL, 101 .util_desc = NULL,
102 .otp_method = OTPUTIL_DFLT_METH, 102 .otp_method = OTPUTIL_DFLT_METH,
103 // HOTP options 103 // HOTP options
104 .hotp_k = NULL, 104 .hotp_k = NULL,
@@ -136,8 +136,8 @@ otputil_free(
136 136
137 if ((tud->hotp_k)) 137 if ((tud->hotp_k))
138 otputil_bvfree(tud->hotp_k); 138 otputil_bvfree(tud->hotp_k);
139 if ((tud->otp_desc)) 139 if ((tud->util_desc))
140 free(tud->otp_desc); 140 free(tud->util_desc);
141 141
142 memset(tud, 0, sizeof(otputil_t)); 142 memset(tud, 0, sizeof(otputil_t));
143 free(tud); 143 free(tud);
@@ -167,8 +167,8 @@ otputil_get_param(
167 167
168 case OTPUTIL_OPT_DESC: 168 case OTPUTIL_OPT_DESC:
169 *((char **)outvalue) = NULL; 169 *((char **)outvalue) = NULL;
170 if ((tud->otp_desc)) 170 if ((tud->util_desc))
171 if (( *((char **)outvalue) = bindle_strdup(tud->otp_desc)) == NULL) 171 if (( *((char **)outvalue) = bindle_strdup(tud->util_desc)) == NULL)
172 return(OTPUTIL_ENOMEM); 172 return(OTPUTIL_ENOMEM);
173 return(OTPUTIL_SUCCESS); 173 return(OTPUTIL_SUCCESS);
174 174
@@ -367,12 +367,12 @@ otputil_set_param(
367 367
368 case OTPUTIL_OPT_DESC: 368 case OTPUTIL_OPT_DESC:
369 ptr = NULL; 369 ptr = NULL;
370 if ((invalue = ((invalue)) ? invalue : defaults->otp_desc) != NULL) 370 if ((invalue = ((invalue)) ? invalue : defaults->util_desc) != NULL)
371 if ((ptr = bindle_strdup(((const char *)invalue))) == NULL) 371 if ((ptr = bindle_strdup(((const char *)invalue))) == NULL)
372 return(OTPUTIL_ENOMEM); 372 return(OTPUTIL_ENOMEM);
373 if ((tud->otp_desc)) 373 if ((tud->util_desc))
374 free(tud->otp_desc); 374 free(tud->util_desc);
375 tud->otp_desc = ptr; 375 tud->util_desc = ptr;
376 return(OTPUTIL_SUCCESS); 376 return(OTPUTIL_SUCCESS);
377 377
378 case OTPUTIL_OPT_DIGITS: 378 case OTPUTIL_OPT_DIGITS:
diff --git a/lib/libotputil/libotputil.h b/lib/libotputil/libotputil.h
index 1153645..d92d804 100644
--- a/lib/libotputil/libotputil.h
+++ b/lib/libotputil/libotputil.h
@@ -78,7 +78,7 @@ struct _otputil_secret
78 int8_t hotp_hmac; 78 int8_t hotp_hmac;
79 int8_t totp_digits; 79 int8_t totp_digits;
80 int8_t totp_hmac; 80 int8_t totp_hmac;
81 char * otp_desc; // description of secret 81 char * util_desc; // description of secret
82 otputil_bv_t * totp_k; 82 otputil_bv_t * totp_k;
83 otputil_bv_t * hotp_k; 83 otputil_bv_t * hotp_k;
84 uint64_t hotp_c; 84 uint64_t hotp_c;