Generated.

diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index d0898365d9f67b575765ca48430dc40e52138592..1bd9d35bd5bb08cecd98cc2b6e704d59b5ac0796 100644 (file)
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -156,6 +156,8 @@ 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, "authz-x509-attr-cert", "FILE ", "Use X.509 Attribute Certificate in FILE as authorization data.");
+       __gaa_helpsingle(0, "authz-saml-assertion", "FILE ", "Use SAML Assertion in FILE as authorization 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.");
@@ -176,12 +178,16 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 119 "cli.gaa"
+#line 125 "cli.gaa"
        char *rest_args;
-#line 110 "cli.gaa"
+#line 116 "cli.gaa"
        int insecure;
-#line 107 "cli.gaa"
+#line 113 "cli.gaa"
        char *port;
+#line 110 "cli.gaa"
+       char *authz_saml_assertion;
+#line 107 "cli.gaa"
+       char *authz_x509_attr_cert;
 #line 104 "cli.gaa"
        char *psk_key;
 #line 101 "cli.gaa"
@@ -306,42 +312,44 @@ static int gaa_error = 0;
 #define GAA_MULTIPLE_OPTION     3
 
 #define GAA_REST                0
-#define GAA_NB_OPTION           35
+#define GAA_NB_OPTION           37
 #define GAAOPTID_copyright     1
 #define GAAOPTID_version       2
 #define GAAOPTID_help  3
 #define GAAOPTID_list  4
 #define GAAOPTID_insecure      5
 #define GAAOPTID_port  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_pgpcertfile   13
-#define GAAOPTID_pgptrustdb    14
-#define GAAOPTID_pgpkeyring    15
-#define GAAOPTID_pgpkeyfile    16
-#define GAAOPTID_x509crlfile   17
-#define GAAOPTID_x509cafile    18
-#define GAAOPTID_ctypes        19
-#define GAAOPTID_kx    20
-#define GAAOPTID_macs  21
-#define GAAOPTID_comp  22
-#define GAAOPTID_protocols     23
-#define GAAOPTID_ciphers       24
-#define GAAOPTID_verbose       25
-#define GAAOPTID_recordsize    26
-#define GAAOPTID_print_cert    27
-#define GAAOPTID_xml   28
-#define GAAOPTID_disable_extensions    29
-#define GAAOPTID_fingerprint   30
-#define GAAOPTID_x509fmtder    31
-#define GAAOPTID_crlf  32
-#define GAAOPTID_starttls      33
-#define GAAOPTID_resume        34
-#define GAAOPTID_debug 35
+#define GAAOPTID_authz_saml_assertion  7
+#define GAAOPTID_authz_x509_attr_cert  8
+#define GAAOPTID_pskkey        9
+#define GAAOPTID_pskusername   10
+#define GAAOPTID_srppasswd     11
+#define GAAOPTID_srpusername   12
+#define GAAOPTID_x509certfile  13
+#define GAAOPTID_x509keyfile   14
+#define GAAOPTID_pgpcertfile   15
+#define GAAOPTID_pgptrustdb    16
+#define GAAOPTID_pgpkeyring    17
+#define GAAOPTID_pgpkeyfile    18
+#define GAAOPTID_x509crlfile   19
+#define GAAOPTID_x509cafile    20
+#define GAAOPTID_ctypes        21
+#define GAAOPTID_kx    22
+#define GAAOPTID_macs  23
+#define GAAOPTID_comp  24
+#define GAAOPTID_protocols     25
+#define GAAOPTID_ciphers       26
+#define GAAOPTID_verbose       27
+#define GAAOPTID_recordsize    28
+#define GAAOPTID_print_cert    29
+#define GAAOPTID_xml   30
+#define GAAOPTID_disable_extensions    31
+#define GAAOPTID_fingerprint   32
+#define GAAOPTID_x509fmtder    33
+#define GAAOPTID_crlf  34
+#define GAAOPTID_starttls      35
+#define GAAOPTID_resume        36
+#define GAAOPTID_debug 37
 
 #line 168 "gaa.skel"
 
@@ -534,6 +542,18 @@ struct GAAOPTION_port
        int size1;
 };
 
+struct GAAOPTION_authz_saml_assertion 
+{
+       char* arg1;
+       int size1;
+};
+
+struct GAAOPTION_authz_x509_attr_cert 
+{
+       char* arg1;
+       int size1;
+};
+
 struct GAAOPTION_pskkey 
 {
        char* arg1;
@@ -691,6 +711,8 @@ static int gaa_get_option_num(char *str, int status)
         {
         case GAA_LETTER_OPTION:
                        GAA_CHECK1STR("p", GAAOPTID_port);
+                       GAA_CHECK1STR("", GAAOPTID_authz_saml_assertion);
+                       GAA_CHECK1STR("", GAAOPTID_authz_x509_attr_cert);
                        GAA_CHECK1STR("", GAAOPTID_pskkey);
                        GAA_CHECK1STR("", GAAOPTID_pskusername);
                        GAA_CHECK1STR("", GAAOPTID_srppasswd);
@@ -737,6 +759,8 @@ 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("authz-saml-assertion", GAAOPTID_authz_saml_assertion);
+                       GAA_CHECKSTR("authz-x509-attr-cert", GAAOPTID_authz_x509_attr_cert);
                        GAA_CHECKSTR("pskkey", GAAOPTID_pskkey);
                        GAA_CHECKSTR("pskusername", GAAOPTID_pskusername);
                        GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
@@ -779,6 +803,8 @@ 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_authz_saml_assertion GAATMP_authz_saml_assertion;
+       struct GAAOPTION_authz_x509_attr_cert GAATMP_authz_x509_attr_cert;
        struct GAAOPTION_pskkey GAATMP_pskkey;
        struct GAAOPTION_pskusername GAATMP_pskusername;
        struct GAAOPTION_srppasswd GAATMP_srppasswd;
@@ -821,35 +847,35 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     {
        case GAAOPTID_copyright:
        OK = 0;
-#line 117 "cli.gaa"
+#line 123 "cli.gaa"
 { print_license(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_version:
        OK = 0;
-#line 116 "cli.gaa"
+#line 122 "cli.gaa"
 { cli_version(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_help:
        OK = 0;
-#line 114 "cli.gaa"
+#line 120 "cli.gaa"
 { gaa_help(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_list:
        OK = 0;
-#line 113 "cli.gaa"
+#line 119 "cli.gaa"
 { print_list(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_insecure:
        OK = 0;
-#line 111 "cli.gaa"
+#line 117 "cli.gaa"
 { gaaval->insecure = 1 ;};
 
                return GAA_OK;
@@ -859,9 +885,29 @@ 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 108 "cli.gaa"
+#line 114 "cli.gaa"
 { gaaval->port = GAATMP_port.arg1 ;};
 
+               return GAA_OK;
+               break;
+       case GAAOPTID_authz_saml_assertion:
+       OK = 0;
+               GAA_TESTMOREARGS;
+               GAA_FILL(GAATMP_authz_saml_assertion.arg1, gaa_getstr, GAATMP_authz_saml_assertion.size1);
+               gaa_index++;
+#line 111 "cli.gaa"
+{ gaaval->authz_saml_assertion = GAATMP_authz_saml_assertion.arg1 ;};
+
+               return GAA_OK;
+               break;
+       case GAAOPTID_authz_x509_attr_cert:
+       OK = 0;
+               GAA_TESTMOREARGS;
+               GAA_FILL(GAATMP_authz_x509_attr_cert.arg1, gaa_getstr, GAATMP_authz_x509_attr_cert.size1);
+               gaa_index++;
+#line 108 "cli.gaa"
+{ gaaval->authz_x509_attr_cert = GAATMP_authz_x509_attr_cert.arg1 ;};
+
                return GAA_OK;
                break;
        case GAAOPTID_pskkey:
@@ -1119,7 +1165,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 120 "cli.gaa"
+#line 126 "cli.gaa"
 { gaaval->rest_args = GAAREST_tmp.arg1; ;};
 
                return GAA_OK;
@@ -1148,7 +1194,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     if(inited == 0)
     {
 
-#line 122 "cli.gaa"
+#line 128 "cli.gaa"
 { gaaval->resume=0; gaaval->port="443"; gaaval->rest_args=NULL; gaaval->ciphers=NULL;
        gaaval->kx=NULL; gaaval->comp=NULL; gaaval->macs=NULL; gaaval->ctype=NULL; gaaval->nciphers=0;
        gaaval->nkx=0; gaaval->ncomp=0; gaaval->nmacs=0; gaaval->nctype = 0; gaaval->record_size=0; 

diff --git a/src/cli-gaa.h b/src/cli-gaa.h
index 012ba4f4aab2cb2c28d3009d830656150858943a..b86664e612b8a1c1a0e017068aca8d2b544d026b 100644 (file)
--- a/src/cli-gaa.h
+++ b/src/cli-gaa.h
@@ -8,12 +8,16 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 119 "cli.gaa"
+#line 125 "cli.gaa"
        char *rest_args;
-#line 110 "cli.gaa"
+#line 116 "cli.gaa"
        int insecure;
-#line 107 "cli.gaa"
+#line 113 "cli.gaa"
        char *port;
+#line 110 "cli.gaa"
+       char *authz_saml_assertion;
+#line 107 "cli.gaa"
+       char *authz_x509_attr_cert;
 #line 104 "cli.gaa"
        char *psk_key;
 #line 101 "cli.gaa"