Fix CVE-2017-6891 in minitasn1 code

[platform/upstream/gnutls.git] / src / ocsptool-args.h.bak

diff --git a/src/ocsptool-args.h.bak b/src/ocsptool-args.h.bak
index 535d6db..21c17d1 100644 (file)
--- a/src/ocsptool-args.h.bak
+++ b/src/ocsptool-args.h.bak
@@ -2,11 +2,11 @@
  *
  *  DO NOT EDIT THIS FILE   (ocsptool-args.h)
  *
- *  It has been AutoGen-ed  June 26, 2014 at 08:28:20 PM by AutoGen 5.18.2
+ *  It has been AutoGen-ed
  *  From the definitions    ocsptool-args.def
  *  and the template file   options
  *
- * Generated from AutoOpts 40:1:15 templates.
+ * Generated from AutoOpts 41:1:16 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -19,7 +19,7 @@
  * The ocsptool program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 2000-2014 Free Software Foundation, and others, all rights reserved.
+ *  Copyright (C) 2000-2017 Free Software Foundation, and others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the GNU General Public License,
  *  version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -55,7 +55,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 163841
+#define AO_TEMPLATE_VERSION 167937
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -90,9 +90,9 @@ typedef enum {
 /** count of all options for ocsptool */
 #define OPTION_CT    20
 /** ocsptool version */
-#define OCSPTOOL_VERSION       "3.3.5"
+#define OCSPTOOL_VERSION       "3.3.27"
 /** Full ocsptool version text */
-#define OCSPTOOL_FULL_VERSION  "ocsptool 3.3.5"
+#define OCSPTOOL_FULL_VERSION  "ocsptool 3.3.27"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -162,11 +162,11 @@ typedef enum {
 #define VALUE_OPT_INDER          0x1009
 #define VALUE_OPT_LOAD_REQUEST   'Q'
 #define VALUE_OPT_LOAD_RESPONSE  'S'
-/** option flag (value) for " (get "val-name") " option */
+/** option flag (value) for help-value option */
 #define VALUE_OPT_HELP          'h'
-/** option flag (value) for " (get "val-name") " option */
+/** option flag (value) for more-help-value option */
 #define VALUE_OPT_MORE_HELP     '!'
-/** option flag (value) for " (get "val-name") " option */
+/** option flag (value) for version-value option */
 #define VALUE_OPT_VERSION       'v'
 /*
  *  Interface defines not associated with particular options
@@ -203,6 +203,11 @@ extern tOptions ocsptoolOptions;
 #     include <libintl.h>
 #   endif
 
+# ifndef ATTRIBUTE_FORMAT_ARG
+#   define ATTRIBUTE_FORMAT_ARG(_a)
+# endif
+
+static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1);
 static inline char* aoGetsText(char const* pz) {
     if (pz == NULL) return NULL;
     return (char*)gettext(pz);