From 933e0bdd4bc16ddb80065c056adc5badc398a341 Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Tue, 31 May 2022 16:37:37 -0800 Subject: libtinytac: updating prefix for RANDOM flags --- include/tinytac.h | 12 ++++++------ lib/libtinytac/lconf.c | 6 +++--- lib/libtinytac/lmemory.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/tinytac.h b/include/tinytac.h index 2383554..e870940 100644 --- a/include/tinytac.h +++ b/include/tinytac.h @@ -118,9 +118,9 @@ #define TTAC_IPV4 0x00000002U #define TTAC_IPV6 0x00000004U // 0x00000008U UNUSED -#define TTAC_RND_RAND 0x00000010U ///< use rand() -#define TTAC_RND_RANDOM 0x00000020U ///< use random() -#define TTAC_RND_URANDOM 0x00000040U ///< use /dev/urandom +#define TTAC_RAND 0x00000010U ///< use rand() +#define TTAC_RANDOM 0x00000020U ///< use random() +#define TTAC_URANDOM 0x00000040U ///< use /dev/urandom #define TTAC_SERVER 0x00000080U #define TTAC_ASCII 0x00000100U ///< allow ASCII authentication #define TTAC_PAP 0x00000200U ///< allow PAP authentication @@ -129,7 +129,7 @@ #define TTAC_MSCHAPV2 0x00001000U ///< allow MSCHAPv2 authentication #define TTAC_AUTHEN_TYPES (TTAC_ASCII | TTAC_PAP | TTAC_CHAP | TTAC_MSCHAP | TTAC_MSCHAPV2 ) #define TTAC_IP_UNSPEC (TTAC_IPV4 | TTAC_IPV6) -#define TTAC_RND_METHODS (TTAC_RND_RAND | TTAC_RND_RANDOM | TTAC_RND_URANDOM) +#define TTAC_RND_METHODS (TTAC_RAND | TTAC_RANDOM | TTAC_URANDOM) #define TTAC_NO 0 @@ -172,13 +172,13 @@ #define TTAC_DFLT_DEBUG_SYSLOG TTAC_NO #define TTAC_DFLT_HOSTS "localhost" #define TTAC_DFLT_SECRETS NULL -#define TTAC_DFLT_OPTS ( TTAC_RND_URANDOM | TTAC_IP_UNSPEC | TTAC_AUTHEN_TYPES ) +#define TTAC_DFLT_OPTS ( TTAC_URANDOM | TTAC_IP_UNSPEC | TTAC_AUTHEN_TYPES ) #define TTAC_DFLT_OPTS_NEG 0 #define TTAC_DFLT_PORT 49 #define TTAC_DFLT_TIMEOUT 10 #define TTAC_DFLT_NET_TIMEOUT_SEC 10 #define TTAC_DFLT_NET_TIMEOUT_USEC 0 -#define TTAC_DFLT_RANDOM TTAC_RND_URANDOM +#define TTAC_DFLT_RANDOM TTAC_URANDOM ////////////////// diff --git a/lib/libtinytac/lconf.c b/lib/libtinytac/lconf.c index 4558b73..b7c1c68 100644 --- a/lib/libtinytac/lconf.c +++ b/lib/libtinytac/lconf.c @@ -396,9 +396,9 @@ tinytac_conf_opt( case TTAC_OPT_RANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( tr, TTAC_OPT_RANDOM, \"%s\" )", __func__, (((value)) ? value : "(null)")); - if (!(strcasecmp(value, "rand"))) ival = TTAC_RND_RAND; - else if (!(strcasecmp(value, "random"))) ival = TTAC_RND_RANDOM; - else if (!(strcasecmp(value, "urandom"))) ival = TTAC_RND_URANDOM; + if (!(strcasecmp(value, "rand"))) ival = TTAC_RAND; + else if (!(strcasecmp(value, "random"))) ival = TTAC_RANDOM; + else if (!(strcasecmp(value, "urandom"))) ival = TTAC_URANDOM; else return(TTAC_SUCCESS); return(tinytac_set_option(NULL, TTAC_OPT_RANDOM, &ival)); diff --git a/lib/libtinytac/lmemory.c b/lib/libtinytac/lmemory.c index 4d5a08a..fcb23e3 100644 --- a/lib/libtinytac/lmemory.c +++ b/lib/libtinytac/lmemory.c @@ -265,9 +265,9 @@ tinytac_get_option( TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_RANDOM, outvalue )", __func__, (((tt)) ? "tt" : "NULL")); switch(*optsp & TTAC_RND_METHODS) { - case TTAC_RND_RAND: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_RND_RAND); break; - case TTAC_RND_RANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_RND_RANDOM); break; - case TTAC_RND_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_RND_URANDOM); break; + case TTAC_RAND: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_RAND); break; + case TTAC_RANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_RANDOM); break; + case TTAC_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", TTAC_URANDOM); break; default: TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %u", (*optsp & TTAC_RND_METHODS)); break; }; *((int *)outvalue) = *optsp & TTAC_RND_METHODS; @@ -437,9 +437,9 @@ tinytac_set_option( idflt = ((tt)) ? tinytac_dflt.opts : TTAC_DFLT_RANDOM; ival = ((invalue)) ? *((const int *)invalue) : (idflt & TTAC_RND_METHODS); switch(ival) - { case TTAC_RND_RAND: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_RND_RAND"); break; - case TTAC_RND_RANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_RND_RANDOM"); break; - case TTAC_RND_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_RND_URANDOM"); break; + { case TTAC_RAND: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_RAND"); break; + case TTAC_RANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_RANDOM"); break; + case TTAC_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %s", "TTAC_URANDOM"); break; default: TinyTacDebug(TTAC_DEBUG_ARGS, " <= invalue: %i", *((const int *)invalue)); return(TTAC_EOPTVAL); }; tt = ((tt)) ? tt : &tinytac_dflt; -- cgit v1.2.3