Adding upstream version 3.7.9.upstream/3.7.9upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 286 insertions, 0 deletions

diff --git a/src/psktool-options.c b/src/psktool-options.c
new file mode 100644
index 0000000..9308995
--- /dev/null
+++ b/src/psktool-options.c
@@ -0,0 +1,286 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "psktool-options.h"
+#include <errno.h>
+#include <error.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif /* !_WIN32 */
+#include <limits.h>
+
+struct psktool_options psktool_options;
+
+static long
+parse_number (const char *arg)
+{
+  char *endptr = NULL;
+  errno = 0;
+  long result;
+
+  if (strncmp (arg, "0x", 2) == 0)
+    result = strtol (arg + 2, &endptr, 16);
+  else if (strncmp (arg, "0", 1) == 0
+           && strspn (arg, "012345678") == strlen (optarg))
+    result = strtol (arg + 1, &endptr, 8);
+  else
+    result = strtol (arg, &endptr, 10);
+
+  if (errno != 0 || (endptr && *endptr != '\0'))
+    error (EXIT_FAILURE, errno, "'%s' is not a recognizable number.",
+           arg);
+
+  return result;
+}
+
+/* Long options.  */
+static const struct option long_options[] =
+{
+  { "debug", required_argument, 0, 'd' },
+  { "keysize", required_argument, 0, 's' },
+  { "username", required_argument, 0, 'u' },
+  { "pskfile", required_argument, 0, 'p' },
+  { "passwd", required_argument, 0, CHAR_MAX + 1 },
+  { "version", optional_argument, 0, 'v' },
+  { "help", no_argument, 0, 'h' },
+  { "more-help", no_argument, 0, '!' },
+  { 0, 0, 0, 0 }
+
+};
+
+int
+process_options (int argc, char **argv)
+{
+  struct psktool_options *opts = &psktool_options;
+  int opt;
+
+
+  while ((opt = getopt_long (argc, argv, "!d:hp:s:u:v:",
+                             long_options, NULL)) != EOF)
+    switch (opt)
+      {
+      case '\0': /* Long option.  */
+        break;
+      case 'd':
+        opts->present.debug = true;
+        opts->arg.debug = optarg;
+        opts->value.debug = parse_number(optarg);
+        opts->enabled.debug = true;
+        break;
+      case 's':
+        opts->present.keysize = true;
+        opts->arg.keysize = optarg;
+        opts->value.keysize = parse_number(optarg);
+        opts->enabled.keysize = true;
+        break;
+      case 'u':
+        opts->present.username = true;
+        opts->arg.username = optarg;
+        opts->enabled.username = true;
+        break;
+      case 'p':
+      case CHAR_MAX + 1: /* --passwd */
+        opts->present.pskfile = true;
+        opts->arg.pskfile = optarg;
+        opts->enabled.pskfile = true;
+        break;
+      case 'v':
+        opts->present.version = true;
+        opts->arg.version = optarg;
+        opts->enabled.version = true;
+        break;
+      case 'h':
+        opts->present.help = true;
+        opts->enabled.help = true;
+        break;
+      case '!':
+        opts->present.more_help = true;
+        opts->enabled.more_help = true;
+        break;
+      default:
+        usage (stderr, EXIT_FAILURE);
+        break;
+      }
+
+  if (HAVE_OPT(DEBUG) && OPT_VALUE_DEBUG < 0)
+    {
+      error (EXIT_FAILURE, 0, "%s option value %d is out of range.",
+             "debug", opts->value.debug);
+    }
+  if (HAVE_OPT(DEBUG) && OPT_VALUE_DEBUG > 9999)
+    {
+      error (EXIT_FAILURE, 0, "%s option value %d is out of range",
+             "debug", opts->value.debug);
+    }
+  if (HAVE_OPT(KEYSIZE) && OPT_VALUE_KEYSIZE < 0)
+    {
+      error (EXIT_FAILURE, 0, "%s option value %d is out of range.",
+             "keysize", opts->value.keysize);
+    }
+  if (HAVE_OPT(KEYSIZE) && OPT_VALUE_KEYSIZE > 512)
+    {
+      error (EXIT_FAILURE, 0, "%s option value %d is out of range",
+             "keysize", opts->value.keysize);
+    }
+  if (optind < argc)
+    {
+      error (EXIT_FAILURE, 0, "Command line arguments are not allowed.");
+    }
+
+
+  if (HAVE_OPT(HELP))
+    {
+      USAGE(0);
+    }
+
+  if (HAVE_OPT(MORE_HELP))
+#ifdef _WIN32
+    {
+      USAGE(0);
+    }
+#else /* _WIN32 */
+    {
+      pid_t pid;
+      int pfds[2];
+
+      if (pipe (pfds) < 0)
+        error (EXIT_FAILURE, errno, "pipe");
+
+      pid = fork ();
+      if (pid < 0)
+        error (EXIT_FAILURE, errno, "fork");
+
+      if (pid == 0)
+        {
+          close (pfds[0]);
+          dup2 (pfds[1], STDOUT_FILENO);
+          close (pfds[1]);
+
+          usage (stdout, 0);
+        }
+      else
+        {
+          const char *args[2];
+          const char *envvar;
+
+          close (pfds[1]);
+          dup2 (pfds[0], STDIN_FILENO);
+          close (pfds[0]);
+
+          envvar = secure_getenv ("PAGER");
+          if (!envvar || *envvar == '\0')
+            args[0] = "more";
+          else
+            args[0] = envvar;
+
+          args[1] = NULL;
+
+          execvp (args[0], (char * const *)args);
+
+          exit (EXIT_FAILURE);
+        }
+    }
+#endif /* !_WIN32 */
+
+  if (HAVE_OPT(VERSION))
+    {
+      if (!OPT_ARG_VERSION || !strcmp (OPT_ARG_VERSION, "c"))
+        {
+          const char str[] =
+            "psktool 3.7.9\n"
+            "Copyright (C) 2000-2021 Free Software Foundation, and others\n"
+            "This is free software. It is licensed for use, modification and\n"
+            "redistribution under the terms of the GNU General Public License,\n"
+            "version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+            "\n"
+            "Please send bug reports to:  <bugs@gnutls.org>            \n";
+          fprintf (stdout, "%s", str);
+          exit(0);
+        }
+      else if (!strcmp (OPT_ARG_VERSION, "v"))
+        {
+          const char str[] =
+            "psktool 3.7.9\n";
+          fprintf (stdout, "%s", str);
+          exit(0);
+        }
+      else if (!strcmp (OPT_ARG_VERSION, "n"))
+        {
+          const char str[] =
+            "psktool 3.7.9\n"
+            "Copyright (C) 2000-2021 Free Software Foundation, and others\n"
+            "This is free software. It is licensed for use, modification and\n"
+            "redistribution under the terms of the GNU General Public License,\n"
+            "version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+            "\n"
+            "gnutls is free software: you can redistribute it and/or\n"
+            "modify it under the terms of the GNU General Public License\n"
+            "as published by the Free Software Foundation,\n"
+            "either version 3 of the License, or (at your option) any later version.\n"
+            "\n"
+            "gnutls is distributed in the hope that it will be useful,\n"
+            "but WITHOUT ANY WARRANTY; without even the implied warranty\n"
+            "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+            "See the GNU General Public License for more details.\n"
+            "\n"
+            "You should have received a copy of the GNU General Public License\n"
+            "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+            "\n"
+            "Please send bug reports to:  <bugs@gnutls.org>            \n";
+          fprintf (stdout, "%s", str);
+          exit(0);
+        }
+      else
+        {
+          error (EXIT_FAILURE, 0,
+                 "version option argument 'a' invalid.  Use:\n"
+                 "	'v' - version only\n"
+                 "	'c' - version and copyright\n"
+                 "	'n' - version and full copyright notice");
+        }
+    }
+
+  return optind;
+}
+
+void
+usage (FILE *out, int status)
+{
+  const char str[] =
+    "psktool - GnuTLS PSK tool\n"
+    "Usage:  psktool [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \n"
+    "\n"
+    "None:\n"
+    "\n"
+    "   -d, --debug=num            Enable debugging\n"
+    "				- it must be in the range:\n"
+    "				  0 to 9999\n"
+    "   -s, --keysize=num          Specify the key size in bytes (default is 32-bytes or 256-bits)\n"
+    "				- it must be in the range:\n"
+    "				  0 to 512\n"
+    "   -u, --username=str         Specify the username to use\n"
+    "   -p, --pskfile=str          Specify a pre-shared key file\n"
+    "\n"
+    "Version, usage and configuration options:\n"
+    "\n"
+    "   -v, --version[=arg]        output version information and exit\n"
+    "   -h, --help                 display extended usage information and exit\n"
+    "   -!, --more-help            extended usage information passed thru pager\n"
+    "\n"
+    "Options are specified by doubled hyphens and their name or by a single\n"
+    "hyphen and the flag character.\n"
+    "\n"
+    "Program  that generates random keys for use with TLS-PSK. The\n"
+    "keys are stored in hexadecimal format in a key file.\n"
+    "\n"
+    "Please send bug reports to:  <bugs@gnutls.org>\n"
+    "\n";
+  fprintf (out, "%s", str);
+  exit (status);
+}