[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-118-g8bc8e21
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-118-g8bc8e21 |
|
Date: |
Mon, 07 Feb 2011 16:09:10 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=8bc8e2190c0133bf1725ff8f65b1d6d8adc86941
The branch, master has been updated
via 8bc8e2190c0133bf1725ff8f65b1d6d8adc86941 (commit)
from 51c63cd868f03376b9eec942963425a8021eff5a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8bc8e2190c0133bf1725ff8f65b1d6d8adc86941
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 7 17:08:39 2011 +0100
Removed more leftovers from opaque PRF output.
-----------------------------------------------------------------------
Summary of changes:
src/cli-gaa.c | 97 +++++++++++++++++++++----------------------------------
src/cli-gaa.h | 8 ++---
src/cli.gaa | 5 +--
src/serv-gaa.c | 91 +++++++++++++++++++---------------------------------
src/serv-gaa.h | 4 +--
src/serv.gaa | 5 +--
6 files changed, 77 insertions(+), 133 deletions(-)
diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 76042d6..dae1c07 100644
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -152,7 +152,6 @@ void gaa_help(void)
__gaa_helpsingle(0, "srppasswd", "PASSWD ", "SRP password to use.");
__gaa_helpsingle(0, "pskusername", "NAME ", "PSK username to use.");
__gaa_helpsingle(0, "pskkey", "KEY ", "PSK key (in hex) to use.");
- __gaa_helpsingle(0, "opaque-prf-input", "DATA ", "Use Opaque PRF Input
DATA.");
__gaa_helpsingle('p', "port", "PORT ", "The port to connect to.");
__gaa_helpsingle(0, "insecure", "", "Don't abort program if server
certificate can't be validated.");
__gaa_helpsingle('l', "list", "", "Print a list of the supported
algorithms and modes.");
@@ -172,14 +171,12 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 103 "cli.gaa"
+#line 100 "cli.gaa"
char *rest_args;
-#line 95 "cli.gaa"
- int insecure;
#line 92 "cli.gaa"
- char *port;
+ int insecure;
#line 89 "cli.gaa"
- char *opaque_prf_input;
+ char *port;
#line 86 "cli.gaa"
char *psk_key;
#line 83 "cli.gaa"
@@ -284,38 +281,37 @@ static int gaa_error = 0;
#define GAA_MULTIPLE_OPTION 3
#define GAA_REST 0
-#define GAA_NB_OPTION 31
+#define GAA_NB_OPTION 30
#define GAAOPTID_version 1
#define GAAOPTID_help 2
#define GAAOPTID_list 3
#define GAAOPTID_insecure 4
#define GAAOPTID_port 5
-#define GAAOPTID_opaque_prf_input 6
-#define GAAOPTID_pskkey 7
-#define GAAOPTID_pskusername 8
-#define GAAOPTID_srppasswd 9
-#define GAAOPTID_srpusername 10
-#define GAAOPTID_x509certfile 11
-#define GAAOPTID_x509keyfile 12
-#define GAAOPTID_pgpsubkey 13
-#define GAAOPTID_pgpcertfile 14
-#define GAAOPTID_pgpkeyring 15
-#define GAAOPTID_pgpkeyfile 16
-#define GAAOPTID_x509crlfile 17
-#define GAAOPTID_x509cafile 18
-#define GAAOPTID_priority 19
-#define GAAOPTID_verbose 20
-#define GAAOPTID_recordsize 21
-#define GAAOPTID_print_cert 22
-#define GAAOPTID_disable_extensions 23
-#define GAAOPTID_fingerprint 24
-#define GAAOPTID_x509fmtder 25
-#define GAAOPTID_crlf 26
-#define GAAOPTID_starttls 27
-#define GAAOPTID_noticket 28
-#define GAAOPTID_rehandshake 29
-#define GAAOPTID_resume 30
-#define GAAOPTID_debug 31
+#define GAAOPTID_pskkey 6
+#define GAAOPTID_pskusername 7
+#define GAAOPTID_srppasswd 8
+#define GAAOPTID_srpusername 9
+#define GAAOPTID_x509certfile 10
+#define GAAOPTID_x509keyfile 11
+#define GAAOPTID_pgpsubkey 12
+#define GAAOPTID_pgpcertfile 13
+#define GAAOPTID_pgpkeyring 14
+#define GAAOPTID_pgpkeyfile 15
+#define GAAOPTID_x509crlfile 16
+#define GAAOPTID_x509cafile 17
+#define GAAOPTID_priority 18
+#define GAAOPTID_verbose 19
+#define GAAOPTID_recordsize 20
+#define GAAOPTID_print_cert 21
+#define GAAOPTID_disable_extensions 22
+#define GAAOPTID_fingerprint 23
+#define GAAOPTID_x509fmtder 24
+#define GAAOPTID_crlf 25
+#define GAAOPTID_starttls 26
+#define GAAOPTID_noticket 27
+#define GAAOPTID_rehandshake 28
+#define GAAOPTID_resume 29
+#define GAAOPTID_debug 30
#line 168 "gaa.skel"
@@ -508,12 +504,6 @@ struct GAAOPTION_port
int size1;
};
-struct GAAOPTION_opaque_prf_input
-{
- char* arg1;
- int size1;
-};
-
struct GAAOPTION_pskkey
{
char* arg1;
@@ -641,7 +631,6 @@ static int gaa_get_option_num(char *str, int status)
{
case GAA_LETTER_OPTION:
GAA_CHECK1STR("p", GAAOPTID_port);
- GAA_CHECK1STR("", GAAOPTID_opaque_prf_input);
GAA_CHECK1STR("", GAAOPTID_pskkey);
GAA_CHECK1STR("", GAAOPTID_pskusername);
GAA_CHECK1STR("", GAAOPTID_srppasswd);
@@ -682,7 +671,6 @@ static int gaa_get_option_num(char *str, int status)
GAA_CHECKSTR("list", GAAOPTID_list);
GAA_CHECKSTR("insecure", GAAOPTID_insecure);
GAA_CHECKSTR("port", GAAOPTID_port);
- GAA_CHECKSTR("opaque-prf-input",
GAAOPTID_opaque_prf_input);
GAA_CHECKSTR("pskkey", GAAOPTID_pskkey);
GAA_CHECKSTR("pskusername", GAAOPTID_pskusername);
GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
@@ -721,7 +709,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
int OK = 0;
int gaa_last_non_option;
struct GAAOPTION_port GAATMP_port;
- struct GAAOPTION_opaque_prf_input GAATMP_opaque_prf_input;
struct GAAOPTION_pskkey GAATMP_pskkey;
struct GAAOPTION_pskusername GAATMP_pskusername;
struct GAAOPTION_srppasswd GAATMP_srppasswd;
@@ -759,28 +746,28 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
{
case GAAOPTID_version:
OK = 0;
-#line 101 "cli.gaa"
+#line 98 "cli.gaa"
{ cli_version(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_help:
OK = 0;
-#line 99 "cli.gaa"
+#line 96 "cli.gaa"
{ gaa_help(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_list:
OK = 0;
-#line 98 "cli.gaa"
+#line 95 "cli.gaa"
{ print_list(gaaval->verbose); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_insecure:
OK = 0;
-#line 96 "cli.gaa"
+#line 93 "cli.gaa"
{ gaaval->insecure = 1 ;};
return GAA_OK;
@@ -790,18 +777,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_port.arg1, gaa_getstr, GAATMP_port.size1);
gaa_index++;
-#line 93 "cli.gaa"
-{ gaaval->port = GAATMP_port.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_opaque_prf_input:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_opaque_prf_input.arg1, gaa_getstr,
GAATMP_opaque_prf_input.size1);
- gaa_index++;
#line 90 "cli.gaa"
-{ gaaval->opaque_prf_input = GAATMP_opaque_prf_input.arg1 ;};
+{ gaaval->port = GAATMP_port.arg1 ;};
return GAA_OK;
break;
@@ -1029,7 +1006,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1);
gaa_index++;
-#line 104 "cli.gaa"
+#line 101 "cli.gaa"
{ gaaval->rest_args = GAAREST_tmp.arg1; ;};
return GAA_OK;
@@ -1058,7 +1035,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
if(inited == 0)
{
-#line 106 "cli.gaa"
+#line 103 "cli.gaa"
{ gaaval->resume=0; gaaval->noticket=0; gaaval->port="443";
gaaval->rest_args=NULL;
gaaval->record_size=0;
gaaval->fingerprint=0; gaaval->pgp_keyring=NULL; gaaval->x509_crlfile =
NULL;
@@ -1067,7 +1044,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
gaaval->srp_username=NULL; gaaval->srp_passwd=NULL; gaaval->fmtder = 0;
gaaval->starttls =0;
gaaval->debug = 0; gaaval->print_cert = 0; gaaval->verbose = 0;
gaaval->psk_key = NULL;
gaaval->psk_username = NULL; gaaval->priorities = NULL;
- gaaval->opaque_prf_input = NULL; gaaval->pgp_subkey = NULL;
gaaval->rehandshake = 0; ;};
+ gaaval->pgp_subkey = NULL; gaaval->rehandshake = 0; ;};
}
inited = 1;
diff --git a/src/cli-gaa.h b/src/cli-gaa.h
index 59117f3..833f534 100644
--- a/src/cli-gaa.h
+++ b/src/cli-gaa.h
@@ -8,14 +8,12 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 103 "cli.gaa"
+#line 100 "cli.gaa"
char *rest_args;
-#line 95 "cli.gaa"
- int insecure;
#line 92 "cli.gaa"
- char *port;
+ int insecure;
#line 89 "cli.gaa"
- char *opaque_prf_input;
+ char *port;
#line 86 "cli.gaa"
char *psk_key;
#line 83 "cli.gaa"
diff --git a/src/cli.gaa b/src/cli.gaa
index d7997d4..efd7e32 100644
--- a/src/cli.gaa
+++ b/src/cli.gaa
@@ -86,9 +86,6 @@ option (pskusername) STR "NAME" { $psk_username = $1 } "PSK
username to use."
#char *psk_key;
option (pskkey) STR "KEY" { $psk_key = $1 } "PSK key (in hex) to use."
-#char *opaque_prf_input;
-option (opaque-prf-input) STR "DATA" { $opaque_prf_input = $1 } "Use Opaque
PRF Input DATA."
-
#char *port;
option (p, port) STR "PORT" { $port = $1 } "The port to connect to."
@@ -111,4 +108,4 @@ init { $resume=0; $noticket=0; $port="443"; $rest_args=NULL;
$srp_username=NULL; $srp_passwd=NULL; $fmtder = 0; $starttls =0;
$debug = 0; $print_cert = 0; $verbose = 0; $psk_key = NULL;
$psk_username = NULL; $priorities = NULL;
- $opaque_prf_input = NULL; $pgp_subkey = NULL; $rehandshake = 0; }
+ $pgp_subkey = NULL; $rehandshake = 0; }
diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index 52e904d..a3c050d 100644
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -151,7 +151,6 @@ void gaa_help(void)
__gaa_helpsingle(0, "pskhint", "HINT ", "PSK identity hint to use.");
__gaa_helpsingle(0, "srppasswd", "FILE ", "SRP password file to use.");
__gaa_helpsingle(0, "srppasswdconf", "FILE ", "SRP password conf file
to use.");
- __gaa_helpsingle(0, "opaque-prf-input", "DATA ", "Use Opaque PRF Input
DATA.");
__gaa_helpsingle(0, "priority", "PRIORITY STRING ", "Priorities
string.");
__gaa_helpsingle('l', "list", "", "Print a list of the supported
algorithms and modes.");
__gaa_helpsingle('h', "help", "", "prints this help");
@@ -170,10 +169,8 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 91 "serv.gaa"
- char *priorities;
#line 88 "serv.gaa"
- char *opaque_prf_input;
+ char *priorities;
#line 85 "serv.gaa"
char *srp_passwd_conf;
#line 82 "serv.gaa"
@@ -278,38 +275,37 @@ static int gaa_error = 0;
#define GAA_MULTIPLE_OPTION 3
#define GAA_REST 0
-#define GAA_NB_OPTION 31
+#define GAA_NB_OPTION 30
#define GAAOPTID_version 1
#define GAAOPTID_help 2
#define GAAOPTID_list 3
#define GAAOPTID_priority 4
-#define GAAOPTID_opaque_prf_input 5
-#define GAAOPTID_srppasswdconf 6
-#define GAAOPTID_srppasswd 7
-#define GAAOPTID_pskhint 8
-#define GAAOPTID_pskpasswd 9
-#define GAAOPTID_disable_client_cert 10
-#define GAAOPTID_require_cert 11
-#define GAAOPTID_x509dsacertfile 12
-#define GAAOPTID_x509dsakeyfile 13
-#define GAAOPTID_x509certfile 14
-#define GAAOPTID_x509keyfile 15
-#define GAAOPTID_pgpsubkey 16
-#define GAAOPTID_pgpcertfile 17
-#define GAAOPTID_pgpkeyfile 18
-#define GAAOPTID_pgpkeyring 19
-#define GAAOPTID_x509crlfile 20
-#define GAAOPTID_x509cafile 21
-#define GAAOPTID_x509fmtder 22
-#define GAAOPTID_dhparams 23
-#define GAAOPTID_echo 24
-#define GAAOPTID_http 25
-#define GAAOPTID_noticket 26
-#define GAAOPTID_nodb 27
-#define GAAOPTID_quiet 28
-#define GAAOPTID_port 29
-#define GAAOPTID_generate 30
-#define GAAOPTID_debug 31
+#define GAAOPTID_srppasswdconf 5
+#define GAAOPTID_srppasswd 6
+#define GAAOPTID_pskhint 7
+#define GAAOPTID_pskpasswd 8
+#define GAAOPTID_disable_client_cert 9
+#define GAAOPTID_require_cert 10
+#define GAAOPTID_x509dsacertfile 11
+#define GAAOPTID_x509dsakeyfile 12
+#define GAAOPTID_x509certfile 13
+#define GAAOPTID_x509keyfile 14
+#define GAAOPTID_pgpsubkey 15
+#define GAAOPTID_pgpcertfile 16
+#define GAAOPTID_pgpkeyfile 17
+#define GAAOPTID_pgpkeyring 18
+#define GAAOPTID_x509crlfile 19
+#define GAAOPTID_x509cafile 20
+#define GAAOPTID_x509fmtder 21
+#define GAAOPTID_dhparams 22
+#define GAAOPTID_echo 23
+#define GAAOPTID_http 24
+#define GAAOPTID_noticket 25
+#define GAAOPTID_nodb 26
+#define GAAOPTID_quiet 27
+#define GAAOPTID_port 28
+#define GAAOPTID_generate 29
+#define GAAOPTID_debug 30
#line 168 "gaa.skel"
@@ -502,12 +498,6 @@ struct GAAOPTION_priority
int size1;
};
-struct GAAOPTION_opaque_prf_input
-{
- char* arg1;
- int size1;
-};
-
struct GAAOPTION_srppasswdconf
{
char* arg1;
@@ -640,7 +630,6 @@ static int gaa_get_option_num(char *str, int status)
{
case GAA_LETTER_OPTION:
GAA_CHECK1STR("", GAAOPTID_priority);
- GAA_CHECK1STR("", GAAOPTID_opaque_prf_input);
GAA_CHECK1STR("", GAAOPTID_srppasswdconf);
GAA_CHECK1STR("", GAAOPTID_srppasswd);
GAA_CHECK1STR("", GAAOPTID_pskhint);
@@ -680,7 +669,6 @@ static int gaa_get_option_num(char *str, int status)
GAA_CHECKSTR("help", GAAOPTID_help);
GAA_CHECKSTR("list", GAAOPTID_list);
GAA_CHECKSTR("priority", GAAOPTID_priority);
- GAA_CHECKSTR("opaque-prf-input",
GAAOPTID_opaque_prf_input);
GAA_CHECKSTR("srppasswdconf", GAAOPTID_srppasswdconf);
GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
GAA_CHECKSTR("pskhint", GAAOPTID_pskhint);
@@ -720,7 +708,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
int OK = 0;
int gaa_last_non_option;
struct GAAOPTION_priority GAATMP_priority;
- struct GAAOPTION_opaque_prf_input GAATMP_opaque_prf_input;
struct GAAOPTION_srppasswdconf GAATMP_srppasswdconf;
struct GAAOPTION_srppasswd GAATMP_srppasswd;
struct GAAOPTION_pskhint GAATMP_pskhint;
@@ -760,21 +747,21 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
{
case GAAOPTID_version:
OK = 0;
-#line 97 "serv.gaa"
+#line 94 "serv.gaa"
{ serv_version(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_help:
OK = 0;
-#line 95 "serv.gaa"
+#line 92 "serv.gaa"
{ gaa_help(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_list:
OK = 0;
-#line 94 "serv.gaa"
+#line 91 "serv.gaa"
{ print_list(0); exit(0); ;};
return GAA_OK;
@@ -784,18 +771,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo
*gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_priority.arg1, gaa_getstr,
GAATMP_priority.size1);
gaa_index++;
-#line 92 "serv.gaa"
-{ gaaval->priorities = GAATMP_priority.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_opaque_prf_input:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_opaque_prf_input.arg1, gaa_getstr,
GAATMP_opaque_prf_input.size1);
- gaa_index++;
#line 89 "serv.gaa"
-{ gaaval->opaque_prf_input = GAATMP_opaque_prf_input.arg1 ;};
+{ gaaval->priorities = GAATMP_priority.arg1 ;};
return GAA_OK;
break;
@@ -1056,7 +1033,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
if(inited == 0)
{
-#line 101 "serv.gaa"
+#line 98 "serv.gaa"
{ gaaval->generate=0; gaaval->port=5556; gaaval->http=0; gaaval->nodb = 0;
gaaval->noticket = 0;
gaaval->x509_cafile = NULL; gaaval->pgp_keyfile=NULL;
gaaval->pgp_certfile=NULL;
gaaval->x509_keyfile=NULL; gaaval->x509_certfile=NULL;
gaaval->x509_crlfile = NULL;
@@ -1065,7 +1042,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
gaaval->pgp_keyring=NULL; gaaval->fmtder = 0;
gaaval->disable_client_cert = 0; gaaval->priorities = NULL;
gaaval->dh_params_file=NULL; gaaval->debug=0; gaaval->require_cert = 0;
gaaval->psk_passwd = 0;
- gaaval->opaque_prf_input=NULL; gaaval->pgp_subkey = NULL;;};
+ gaaval->pgp_subkey = NULL;;};
}
inited = 1;
diff --git a/src/serv-gaa.h b/src/serv-gaa.h
index cb9f66c..2a4a08a 100644
--- a/src/serv-gaa.h
+++ b/src/serv-gaa.h
@@ -8,10 +8,8 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 91 "serv.gaa"
- char *priorities;
#line 88 "serv.gaa"
- char *opaque_prf_input;
+ char *priorities;
#line 85 "serv.gaa"
char *srp_passwd_conf;
#line 82 "serv.gaa"
diff --git a/src/serv.gaa b/src/serv.gaa
index 0828a86..0d886a5 100644
--- a/src/serv.gaa
+++ b/src/serv.gaa
@@ -85,9 +85,6 @@ option (srppasswd) STR "FILE" { $srp_passwd = $1 } "SRP
password file to use."
#char *srp_passwd_conf;
option (srppasswdconf) STR "FILE" { $srp_passwd_conf = $1 } "SRP password conf
file to use."
-#char *opaque_prf_input;
-option (opaque-prf-input) STR "DATA" { $opaque_prf_input = $1 } "Use Opaque
PRF Input DATA."
-
#char *priorities;
option (priority) STR "PRIORITY STRING" { $priorities = $1 } "Priorities
string."
@@ -106,4 +103,4 @@ init { $generate=0; $port=5556; $http=0; $nodb = 0;
$noticket = 0;
$pgp_keyring=NULL; $fmtder = 0;
$disable_client_cert = 0; $priorities = NULL;
$dh_params_file=NULL; $debug=0; $require_cert = 0; $psk_passwd = 0;
- $opaque_prf_input=NULL; $pgp_subkey = NULL;}
+ $pgp_subkey = NULL;}
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-118-g8bc8e21,
Nikos Mavrogiannopoulos <=