From: Nikos Mavrogiannopoulos Date: Sat, 21 Jan 2012 01:00:42 +0000 (+0100) Subject: updates. X-Git-Tag: gnutls_3_0_13~252 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2ae1e99a616b60453044055d0bb68bc0a2d2a49;p=thirdparty%2Fgnutls.git updates. --- diff --git a/doc/manpages/gnutls-cli-debug.1 b/doc/manpages/gnutls-cli-debug.1 index 51370f69cb..95ab9f34f7 100644 --- a/doc/manpages/gnutls-cli-debug.1 +++ b/doc/manpages/gnutls-cli-debug.1 @@ -1,8 +1,8 @@ -.TH gnutls-cli-debug 1 "19 Jan 2012" "3.0.11" "User Commands" +.TH gnutls-cli-debug 1 "21 Jan 2012" "3.0.12" "User Commands" .\" .\" DO NOT EDIT THIS FILE (cli-debug-args.man) .\" -.\" It has been AutoGen-ed January 19, 2012 at 09:40:47 PM by AutoGen 5.12 +.\" It has been AutoGen-ed January 21, 2012 at 02:00:25 AM by AutoGen 5.12 .\" From the definitions ../../src/cli-debug-args.def .\" and the template file agman-cmd.tpl .\" diff --git a/doc/manpages/psktool.1 b/doc/manpages/psktool.1 index 77b066749a..e976db6c56 100644 --- a/doc/manpages/psktool.1 +++ b/doc/manpages/psktool.1 @@ -1,8 +1,8 @@ -.TH psktool 1 "19 Jan 2012" "3.0.11" "User Commands" +.TH psktool 1 "21 Jan 2012" "3.0.12" "User Commands" .\" .\" DO NOT EDIT THIS FILE (psk-args.man) .\" -.\" It has been AutoGen-ed January 19, 2012 at 09:42:11 PM by AutoGen 5.12 +.\" It has been AutoGen-ed January 21, 2012 at 02:00:25 AM by AutoGen 5.12 .\" From the definitions ../../src/psk-args.def .\" and the template file agman-cmd.tpl .\" @@ -32,8 +32,16 @@ in the range 0 through 9999 .sp Specifies the debug level. .TP -.BR \-s ", " -\-keysize +.BR \-s " \fInumber\fP, " \-\-keysize "=" \fInumber\fP specify the key size in bytes. +This option takes an integer number as its argument. +The value of \fInumber\fP is constrained to being: +.in +4 +.nf +.na +in the range 0 through 512 +.fi +.in -4 .sp .TP .BR \-u " \fIstring\fP, " \-\-username "=" \fIstring\fP diff --git a/doc/manpages/srptool.1 b/doc/manpages/srptool.1 index ea0b1f20cf..12f21541d3 100644 --- a/doc/manpages/srptool.1 +++ b/doc/manpages/srptool.1 @@ -1,8 +1,8 @@ -.TH srptool 1 "19 Jan 2012" "3.0.11" "User Commands" +.TH srptool 1 "21 Jan 2012" "3.0.12" "User Commands" .\" .\" DO NOT EDIT THIS FILE (srptool-args.man) .\" -.\" It has been AutoGen-ed January 19, 2012 at 09:41:17 PM by AutoGen 5.12 +.\" It has been AutoGen-ed January 21, 2012 at 02:00:25 AM by AutoGen 5.12 .\" From the definitions ../../src/srptool-args.def .\" and the template file agman-cmd.tpl .\" diff --git a/src/cli-args.c b/src/cli-args.c index 441771dfaf..3f8c39f7a0 100644 --- a/src/cli-args.c +++ b/src/cli-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.c) * - * It has been AutoGen-ed January 19, 2012 at 09:42:06 PM by AutoGen 5.12 + * It has been AutoGen-ed January 21, 2012 at 01:58:52 AM by AutoGen 5.12 * From the definitions cli-args.def * and the template file options * @@ -55,7 +55,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ static char const zCopyright[278] = -"gnutls-cli 3.0.11\n\ +"gnutls-cli 3.0.12\n\ Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the\n\ @@ -877,7 +877,7 @@ static tOptDesc optDesc[OPTION_CT] = { */ static char const zPROGNAME[11] = "GNUTLS_CLI"; static char const zUsageTitle[100] = -"gnutls-cli - GnuTLS client - Ver. 3.0.11\n\ +"gnutls-cli - GnuTLS client - Ver. 3.0.12\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; #define zRcName NULL #define apzHomeList NULL diff --git a/src/cli-args.h b/src/cli-args.h index 72e15387a4..c05ff9bbcf 100644 --- a/src/cli-args.h +++ b/src/cli-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (cli-args.h) * - * It has been AutoGen-ed January 19, 2012 at 09:42:05 PM by AutoGen 5.12 + * It has been AutoGen-ed January 21, 2012 at 01:58:52 AM by AutoGen 5.12 * From the definitions cli-args.def * and the template file options * @@ -105,8 +105,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define GNUTLS_CLI_VERSION "3.0.11" -#define GNUTLS_CLI_FULL_VERSION "gnutls-cli 3.0.11" +#define GNUTLS_CLI_VERSION "3.0.12" +#define GNUTLS_CLI_FULL_VERSION "gnutls-cli 3.0.12" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/src/srptool-args.c b/src/srptool-args.c index c2b831f2ce..38b0b82a4b 100644 --- a/src/srptool-args.c +++ b/src/srptool-args.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (srptool-args.c) * - * It has been AutoGen-ed January 19, 2012 at 09:42:05 PM by AutoGen 5.12 + * It has been AutoGen-ed January 21, 2012 at 01:58:49 AM by AutoGen 5.12 * From the definitions srptool-args.def * and the template file options * @@ -55,7 +55,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ static char const zCopyright[275] = -"srptool 3.0.11\n\ +"srptool 3.0.12\n\ Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the\n\ @@ -337,7 +337,7 @@ static tOptDesc optDesc[OPTION_CT] = { */ static char const zPROGNAME[8] = "SRPTOOL"; static char const zUsageTitle[99] = -"srptool - GnuTLS SRP tool - Ver. 3.0.11\n\ +"srptool - GnuTLS SRP tool - Ver. 3.0.12\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; #define zRcName NULL #define apzHomeList NULL diff --git a/src/srptool-args.h b/src/srptool-args.h index 20db86d1bb..1b38ac5e88 100644 --- a/src/srptool-args.h +++ b/src/srptool-args.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (srptool-args.h) * - * It has been AutoGen-ed January 19, 2012 at 09:42:05 PM by AutoGen 5.12 + * It has been AutoGen-ed January 21, 2012 at 01:58:49 AM by AutoGen 5.12 * From the definitions srptool-args.def * and the template file options * @@ -80,8 +80,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 11 -#define SRPTOOL_VERSION "3.0.11" -#define SRPTOOL_FULL_VERSION "srptool 3.0.11" +#define SRPTOOL_VERSION "3.0.12" +#define SRPTOOL_FULL_VERSION "srptool 3.0.12" /* * Interface defines for all options. Replace "n" with the UPPER_CASED