4 files changed, 10 insertions, 23 deletions

diff --git a/src/otputil.c b/src/otputil.c
index 3685716..ba84f81 100644
--- a/src/otputil.c
+++ b/src/otputil.c
@@ -132,10 +132,6 @@ otputil_widget_version(
 /////////////////
 #pragma mark - Variables
 
-#pragma mark otputil_pass
-const char * otputil_pass = NULL;
-
-
 #pragma mark otputil_widget_map[]
 static otputil_widget_t otputil_widget_map[] =
 {
@@ -374,7 +370,7 @@ otputil_arguments(
          break;
 
          case 'p':
-         otputil_pass = otputil_getpass("Enter code: ", NULL, 0);
+         cnf->pass = otputil_getpass("Enter code: ", NULL, 0);
          break;
 
          case 'T':
diff --git a/src/otputil.h b/src/otputil.h
index 5f80223..989adb3 100644
--- a/src/otputil.h
+++ b/src/otputil.h
@@ -89,20 +89,11 @@ struct _otputil_cli_config
    int                        argc;
    char **                    argv;
    const char *               prog_name;
+   const char *               pass;
    const otputil_widget_t *   widget;
 };
 
 
-/////////////////
-//             //
-//  Variables  //
-//             //
-/////////////////
-#pragma mark - Variables
-
-extern const char * otputil_pass;
-
-
 //////////////////
 //              //
 //  Prototypes  //
diff --git a/src/widget-hotp.c b/src/widget-hotp.c
index 7e6a991..92d383d 100644
--- a/src/widget-hotp.c
+++ b/src/widget-hotp.c
@@ -107,15 +107,15 @@ otputil_widget_hotp(
    // initial processing of cli arguments
    if ((rc = otputil_arguments(cnf, cnf->argc, cnf->argv)) != 0)
       return((rc == -1) ? 0 : 1);
-   if ( ((otputil_pass)) && (cnf->argc > optind) )
+   if ( ((cnf->pass)) && (cnf->argc > optind) )
    {
       fprintf(stderr, "%s: cannot specify code and use `-p'\n", cnf->prog_name);
       fprintf(stderr, "Try `%s --help' for more information.\n", cnf->prog_name);
       return(1);
    };
-   otputil_pass = (cnf->argc > optind) ? cnf->argv[optind] : otputil_pass;
+   cnf->pass = (cnf->argc > optind) ? cnf->argv[optind] : cnf->pass;
 
-   if ((otputil_pass))
+   if ((cnf->pass))
       otputil_widget_hotp_verify(cnf);
 
    if ((code = otputil_str(NULL, buff, sizeof(buff))) == NULL)
@@ -164,7 +164,7 @@ otputil_widget_hotp_verify(
       return(1);
    };
 
-   if ((strcasecmp(otputil_pass, code)))
+   if ((strcasecmp(cnf->pass, code)))
    {
       printf("%s\n", "invalid code");
       return(2);
diff --git a/src/widget-totp.c b/src/widget-totp.c
index b3f552f..fd0ee5d 100644
--- a/src/widget-totp.c
+++ b/src/widget-totp.c
@@ -105,15 +105,15 @@ otputil_widget_totp(
    // initial processing of cli arguments
    if ((rc = otputil_arguments(cnf, cnf->argc, cnf->argv)) != 0)
       return((rc == -1) ? 0 : 1);
-   if ( ((otputil_pass)) && (cnf->argc > optind) )
+   if ( ((cnf->pass)) && (cnf->argc > optind) )
    {
       fprintf(stderr, "%s: cannot specify code and use `-p'\n", cnf->prog_name);
       fprintf(stderr, "Try `%s --help' for more information.\n", cnf->prog_name);
       return(1);
    };
-   otputil_pass = (cnf->argc > optind) ? cnf->argv[optind] : otputil_pass;
+   cnf->pass = (cnf->argc > optind) ? cnf->argv[optind] : cnf->pass;
 
-   if ((otputil_pass))
+   if ((cnf->pass))
       return(otputil_widget_totp_verify(cnf));
 
    return(otputil_widget_totp_code(cnf));
@@ -171,7 +171,7 @@ otputil_widget_totp_verify(
       return(1);
    };
 
-   if ((strcasecmp(otputil_pass, code)))
+   if ((strcasecmp(cnf->pass, code)))
    {
       printf("%s\n", "invalid code");
       return(2);