otputil: refactoring aliases for OTP widget

2 files changed, 14 insertions, 23 deletions

diff --git a/src/otputil.c b/src/otputil.c
index fac63f2..5c7d798 100644
--- a/src/otputil.c
+++ b/src/otputil.c
@@ -183,33 +183,13 @@ static otputil_widget_t otputil_widget_map[] =
       .func_usage = &otputil_widget_otp_usage,
    },
    {  .name       = "otp-md4",
-      .desc       = "otp alias for MD4",
-      .usage      = " [ sequence [ seed [ code ]]]",
-      .short_opt  = (TOTP_SHORT_OPT "c:O:oP:ps:"),
-      .arg_min    = 0,
-      .arg_max    = 3,
-      .aliases    = NULL,
-      .func_exec  = &otputil_widget_otp_md4,
-      .func_usage = NULL,
-   },
-   {  .name       = "otp-md5",
-      .desc       = "otp alias for MD5",
-      .usage      = " [ sequence [ seed [ code ]]]",
-      .short_opt  = (TOTP_SHORT_OPT "c:O:oP:ps:"),
-      .arg_min    = 0,
-      .arg_max    = 3,
-      .aliases    = NULL,
-      .func_exec  = &otputil_widget_otp_md5,
-      .func_usage = NULL,
-   },
-   {  .name       = "otp-sha1",
-      .desc       = "otp alias for SHA1",
+      .desc       = NULL,
       .usage      = " [ sequence [ seed [ code ]]]",
       .short_opt  = (TOTP_SHORT_OPT "c:O:oP:ps:"),
       .arg_min    = 0,
       .arg_max    = 3,
-      .aliases    = NULL,
-      .func_exec  = &otputil_widget_otp_sha1,
+      .aliases    = (const char *[]){ "otp-md5", "otp-sha1", "otp-sha256", "otp-sha512", NULL },
+      .func_exec  = &otputil_widget_otp,
       .func_usage = NULL,
    },
    {  .name       = "skey",
diff --git a/src/widget-otp.c b/src/widget-otp.c
index d4c06fc..079f035 100644
--- a/src/widget-otp.c
+++ b/src/widget-otp.c
@@ -115,6 +115,17 @@ otputil_widget_otp(
       return(1);
    };
 
+   // set default hash
+   if (!(strncasecmp(cnf->argv[0], "otp-", 4)))
+   {
+      if ((hash = otputil_str2md(&cnf->argv[0][4])) == -1)
+      {
+         fprintf(stderr, "%s: unsupported hash algorithm\n", cnf->prog_name);
+         return(1);
+      };
+      otputil_set_param(NULL, OTPUTIL_OPT_OTP_HASH, &hash);
+   };
+
    // initial processing of cli arguments
    if ((rc = otputil_arguments(cnf, cnf->argc, cnf->argv)) != 0)
       return((rc == -1) ? 0 : 1);