summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libextra/gnutls_openpgp.c6
-rw-r--r--src/certtool-gaa.c101
-rw-r--r--src/certtool-gaa.h30
-rw-r--r--src/certtool.gaa10
-rw-r--r--src/crypt-gaa.c45
-rw-r--r--src/crypt-gaa.h14
-rw-r--r--src/crypt.c4
-rw-r--r--src/crypt.gaa10
8 files changed, 131 insertions, 89 deletions
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index c1e9ec5025..bce3ae1fef 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -390,8 +390,10 @@ _gnutls_openpgp_cert2gnutls_cert( gnutls_cert *cert, const gnutls_datum *raw )
rc = cdk_kbnode_read_from_mem( &knode, raw->data, raw->size );
if( !(rc = _gnutls_map_cdk_rc( rc )) )
pkt = cdk_kbnode_find_packet( knode, CDK_PKT_PUBLIC_KEY );
- if( !pkt )
- rc = GNUTLS_E_INTERNAL_ERROR;
+ if( !pkt ) {
+ gnutls_assert();
+ rc = _gnutls_map_cdk_rc( rc);
+ }
if( !rc )
rc = _gnutls_set_datum( &cert->raw, raw->data, raw->size );
if( !rc )
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index f490374cb6..e0dc26fb26 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -1,6 +1,15 @@
/* File generated by GAA 1.6.2
*/
#define GAA_NO_WIN32
+#line 1 "certtool.gaa"
+
+
+/* C declarations */
+
+#ifndef _WIN32
+# include <windows.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -159,35 +168,35 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 65 "certtool.gaa"
+#line 75 "certtool.gaa"
int debug;
-#line 62 "certtool.gaa"
+#line 72 "certtool.gaa"
char *infile;
-#line 59 "certtool.gaa"
+#line 69 "certtool.gaa"
char *outfile;
-#line 56 "certtool.gaa"
+#line 66 "certtool.gaa"
int bits;
-#line 53 "certtool.gaa"
+#line 63 "certtool.gaa"
int outcert_format;
-#line 50 "certtool.gaa"
+#line 60 "certtool.gaa"
int incert_format;
-#line 47 "certtool.gaa"
+#line 57 "certtool.gaa"
int export;
-#line 44 "certtool.gaa"
+#line 54 "certtool.gaa"
int pkcs8;
-#line 33 "certtool.gaa"
+#line 43 "certtool.gaa"
char *pass;
-#line 30 "certtool.gaa"
+#line 40 "certtool.gaa"
char *ca;
-#line 27 "certtool.gaa"
+#line 37 "certtool.gaa"
char *ca_privkey;
-#line 24 "certtool.gaa"
+#line 34 "certtool.gaa"
char *cert;
-#line 21 "certtool.gaa"
+#line 31 "certtool.gaa"
char *request;
-#line 18 "certtool.gaa"
+#line 28 "certtool.gaa"
char *privkey;
-#line 3 "certtool.gaa"
+#line 13 "certtool.gaa"
int action;
#line 114 "gaa.skel"
@@ -423,7 +432,7 @@ int gaa_getint(char *arg)
{
int tmp;
char a;
- if(sscanf(arg, "%d%c", &tmp, &a) != 1)
+ if(sscanf(arg, "%d%c", &tmp, &a) < 1)
{
printf("Option %s: '%s' isn't an integer\n", gaa_current_option, arg);
GAAERROR(-1);
@@ -449,7 +458,7 @@ float gaa_getfloat(char *arg)
{
float tmp;
char a;
- if(sscanf(arg, "%f%c", &tmp, &a) != 1)
+ if(sscanf(arg, "%f%c", &tmp, &a) < 1)
{
printf("Option %s: '%s' isn't a float number\n", gaa_current_option, arg);
GAAERROR(-1);
@@ -653,21 +662,21 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
{
case GAAOPTID_copyright:
OK = 0;
-#line 71 "certtool.gaa"
+#line 81 "certtool.gaa"
{ print_license(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_version:
OK = 0;
-#line 70 "certtool.gaa"
+#line 80 "certtool.gaa"
{ certtool_version(); exit(0); ;};
return GAA_OK;
break;
case GAAOPTID_help:
OK = 0;
-#line 68 "certtool.gaa"
+#line 78 "certtool.gaa"
{ gaa_help(); exit(0); ;};
return GAA_OK;
@@ -677,7 +686,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1);
gaa_index++;
-#line 66 "certtool.gaa"
+#line 76 "certtool.gaa"
{ gaaval->debug = GAATMP_debug.arg1 ;};
return GAA_OK;
@@ -687,7 +696,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_infile.arg1, gaa_getstr, GAATMP_infile.size1);
gaa_index++;
-#line 63 "certtool.gaa"
+#line 73 "certtool.gaa"
{ gaaval->infile = GAATMP_infile.arg1 ;};
return GAA_OK;
@@ -697,7 +706,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_outfile.arg1, gaa_getstr, GAATMP_outfile.size1);
gaa_index++;
-#line 60 "certtool.gaa"
+#line 70 "certtool.gaa"
{ gaaval->outfile = GAATMP_outfile.arg1 ;};
return GAA_OK;
@@ -707,63 +716,63 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_bits.arg1, gaa_getint, GAATMP_bits.size1);
gaa_index++;
-#line 57 "certtool.gaa"
+#line 67 "certtool.gaa"
{ gaaval->bits = GAATMP_bits.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_outder:
OK = 0;
-#line 54 "certtool.gaa"
+#line 64 "certtool.gaa"
{ gaaval->outcert_format=1 ;};
return GAA_OK;
break;
case GAAOPTID_inder:
OK = 0;
-#line 51 "certtool.gaa"
+#line 61 "certtool.gaa"
{ gaaval->incert_format=1 ;};
return GAA_OK;
break;
case GAAOPTID_export_ciphers:
OK = 0;
-#line 48 "certtool.gaa"
+#line 58 "certtool.gaa"
{ gaaval->export=1 ;};
return GAA_OK;
break;
case GAAOPTID_pkcs8:
OK = 0;
-#line 45 "certtool.gaa"
+#line 55 "certtool.gaa"
{ gaaval->pkcs8=1 ;};
return GAA_OK;
break;
case GAAOPTID_to_p12:
OK = 0;
-#line 42 "certtool.gaa"
+#line 52 "certtool.gaa"
{ gaaval->action = 8; ;};
return GAA_OK;
break;
case GAAOPTID_key_info:
OK = 0;
-#line 40 "certtool.gaa"
+#line 50 "certtool.gaa"
{ gaaval->action = 6; ;};
return GAA_OK;
break;
case GAAOPTID_p12_info:
OK = 0;
-#line 38 "certtool.gaa"
+#line 48 "certtool.gaa"
{ gaaval->action = 9; ;};
return GAA_OK;
break;
case GAAOPTID_certificate_info:
OK = 0;
-#line 36 "certtool.gaa"
+#line 46 "certtool.gaa"
{ gaaval->action = 2; ;};
return GAA_OK;
@@ -773,7 +782,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_password.arg1, gaa_getstr, GAATMP_password.size1);
gaa_index++;
-#line 34 "certtool.gaa"
+#line 44 "certtool.gaa"
{ gaaval->pass = GAATMP_password.arg1 ;};
return GAA_OK;
@@ -783,7 +792,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_load_ca_certificate.arg1, gaa_getstr, GAATMP_load_ca_certificate.size1);
gaa_index++;
-#line 31 "certtool.gaa"
+#line 41 "certtool.gaa"
{ gaaval->ca = GAATMP_load_ca_certificate.arg1 ;};
return GAA_OK;
@@ -793,7 +802,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_load_ca_privkey.arg1, gaa_getstr, GAATMP_load_ca_privkey.size1);
gaa_index++;
-#line 28 "certtool.gaa"
+#line 38 "certtool.gaa"
{ gaaval->ca_privkey = GAATMP_load_ca_privkey.arg1 ;};
return GAA_OK;
@@ -803,7 +812,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_load_certificate.arg1, gaa_getstr, GAATMP_load_certificate.size1);
gaa_index++;
-#line 25 "certtool.gaa"
+#line 35 "certtool.gaa"
{ gaaval->cert = GAATMP_load_certificate.arg1 ;};
return GAA_OK;
@@ -813,7 +822,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_load_request.arg1, gaa_getstr, GAATMP_load_request.size1);
gaa_index++;
-#line 22 "certtool.gaa"
+#line 32 "certtool.gaa"
{ gaaval->request = GAATMP_load_request.arg1 ;};
return GAA_OK;
@@ -823,56 +832,56 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_load_privkey.arg1, gaa_getstr, GAATMP_load_privkey.size1);
gaa_index++;
-#line 19 "certtool.gaa"
+#line 29 "certtool.gaa"
{ gaaval->privkey = GAATMP_load_privkey.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_generate_dh_params:
OK = 0;
-#line 16 "certtool.gaa"
+#line 26 "certtool.gaa"
{ gaaval->action=10; ;};
return GAA_OK;
break;
case GAAOPTID_verify_chain:
OK = 0;
-#line 14 "certtool.gaa"
+#line 24 "certtool.gaa"
{ gaaval->action=5; ;};
return GAA_OK;
break;
case GAAOPTID_generate_request:
OK = 0;
-#line 12 "certtool.gaa"
+#line 22 "certtool.gaa"
{ gaaval->action=3; ;};
return GAA_OK;
break;
case GAAOPTID_generate_privkey:
OK = 0;
-#line 10 "certtool.gaa"
+#line 20 "certtool.gaa"
{ gaaval->action=1; ;};
return GAA_OK;
break;
case GAAOPTID_update_certificate:
OK = 0;
-#line 8 "certtool.gaa"
+#line 18 "certtool.gaa"
{ gaaval->action=7; ;};
return GAA_OK;
break;
case GAAOPTID_generate_certificate:
OK = 0;
-#line 6 "certtool.gaa"
+#line 16 "certtool.gaa"
{ gaaval->action=4; ;};
return GAA_OK;
break;
case GAAOPTID_generate_self_signed:
OK = 0;
-#line 4 "certtool.gaa"
+#line 14 "certtool.gaa"
{ gaaval->action=0; ;};
return GAA_OK;
@@ -901,7 +910,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
if(inited == 0)
{
-#line 73 "certtool.gaa"
+#line 83 "certtool.gaa"
{ gaaval->bits = 1024; gaaval->pkcs8 = 0; gaaval->privkey = NULL; gaaval->ca=NULL; gaaval->ca_privkey = NULL;
gaaval->debug=1; gaaval->request = NULL; gaaval->infile = NULL; gaaval->outfile = NULL; gaaval->cert = NULL;
gaaval->incert_format = 0; gaaval->outcert_format = 0; gaaval->action=-1; gaaval->pass = NULL;
diff --git a/src/certtool-gaa.h b/src/certtool-gaa.h
index d2fd49acab..1c71592bd7 100644
--- a/src/certtool-gaa.h
+++ b/src/certtool-gaa.h
@@ -8,35 +8,35 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 65 "certtool.gaa"
+#line 75 "certtool.gaa"
int debug;
-#line 62 "certtool.gaa"
+#line 72 "certtool.gaa"
char *infile;
-#line 59 "certtool.gaa"
+#line 69 "certtool.gaa"
char *outfile;
-#line 56 "certtool.gaa"
+#line 66 "certtool.gaa"
int bits;
-#line 53 "certtool.gaa"
+#line 63 "certtool.gaa"
int outcert_format;
-#line 50 "certtool.gaa"
+#line 60 "certtool.gaa"
int incert_format;
-#line 47 "certtool.gaa"
+#line 57 "certtool.gaa"
int export;
-#line 44 "certtool.gaa"
+#line 54 "certtool.gaa"
int pkcs8;
-#line 33 "certtool.gaa"
+#line 43 "certtool.gaa"
char *pass;
-#line 30 "certtool.gaa"
+#line 40 "certtool.gaa"
char *ca;
-#line 27 "certtool.gaa"
+#line 37 "certtool.gaa"
char *ca_privkey;
-#line 24 "certtool.gaa"
+#line 34 "certtool.gaa"
char *cert;
-#line 21 "certtool.gaa"
+#line 31 "certtool.gaa"
char *request;
-#line 18 "certtool.gaa"
+#line 28 "certtool.gaa"
char *privkey;
-#line 3 "certtool.gaa"
+#line 13 "certtool.gaa"
int action;
#line 114 "gaa.skel"
diff --git a/src/certtool.gaa b/src/certtool.gaa
index 5eef66e797..7b8cd4e56b 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -1,3 +1,13 @@
+#{
+
+/* C declarations */
+
+#ifndef _WIN32
+# include <windows.h>
+#endif
+
+#}
+
helpnode "Certtool help\nUsage : certtool [options]"
#int action;
diff --git a/src/crypt-gaa.c b/src/crypt-gaa.c
index 9b3a5cc91c..5618cd85ba 100644
--- a/src/crypt-gaa.c
+++ b/src/crypt-gaa.c
@@ -1,6 +1,15 @@
/* File generated by GAA 1.6.2
*/
#define GAA_NO_WIN32
+#line 1 "crypt.gaa"
+
+
+/* C declarations */
+
+#ifndef _WIN32
+# include <windows.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -139,19 +148,19 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 21 "crypt.gaa"
+#line 31 "crypt.gaa"
char *create_conf;
-#line 18 "crypt.gaa"
+#line 28 "crypt.gaa"
char *passwd_conf;
-#line 15 "crypt.gaa"
+#line 25 "crypt.gaa"
int verify;
-#line 12 "crypt.gaa"
+#line 22 "crypt.gaa"
int salt;
-#line 9 "crypt.gaa"
+#line 19 "crypt.gaa"
int index;
-#line 6 "crypt.gaa"
+#line 16 "crypt.gaa"
char *passwd;
-#line 3 "crypt.gaa"
+#line 13 "crypt.gaa"
char *username;
#line 114 "gaa.skel"
@@ -367,7 +376,7 @@ int gaa_getint(char *arg)
{
int tmp;
char a;
- if(sscanf(arg, "%d%c", &tmp, &a) != 1)
+ if(sscanf(arg, "%d%c", &tmp, &a) < 1)
{
printf("Option %s: '%s' isn't an integer\n", gaa_current_option, arg);
GAAERROR(-1);
@@ -393,7 +402,7 @@ float gaa_getfloat(char *arg)
{
float tmp;
char a;
- if(sscanf(arg, "%f%c", &tmp, &a) != 1)
+ if(sscanf(arg, "%f%c", &tmp, &a) < 1)
{
printf("Option %s: '%s' isn't a float number\n", gaa_current_option, arg);
GAAERROR(-1);
@@ -529,7 +538,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
{
case GAAOPTID_help:
OK = 0;
-#line 24 "crypt.gaa"
+#line 34 "crypt.gaa"
{ gaa_help(); exit(0); ;};
return GAA_OK;
@@ -539,7 +548,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_create_conf.arg1, gaa_getstr, GAATMP_create_conf.size1);
gaa_index++;
-#line 22 "crypt.gaa"
+#line 32 "crypt.gaa"
{ gaaval->create_conf = GAATMP_create_conf.arg1 ;};
return GAA_OK;
@@ -549,14 +558,14 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_passwd_conf.arg1, gaa_getstr, GAATMP_passwd_conf.size1);
gaa_index++;
-#line 19 "crypt.gaa"
+#line 29 "crypt.gaa"
{ gaaval->passwd_conf = GAATMP_passwd_conf.arg1 ;};
return GAA_OK;
break;
case GAAOPTID_verify:
OK = 0;
-#line 16 "crypt.gaa"
+#line 26 "crypt.gaa"
{ gaaval->verify = 1 ;};
return GAA_OK;
@@ -566,7 +575,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_salt.arg1, gaa_getint, GAATMP_salt.size1);
gaa_index++;
-#line 13 "crypt.gaa"
+#line 23 "crypt.gaa"
{ gaaval->salt = GAATMP_salt.arg1 ;};
return GAA_OK;
@@ -576,7 +585,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_index.arg1, gaa_getint, GAATMP_index.size1);
gaa_index++;
-#line 10 "crypt.gaa"
+#line 20 "crypt.gaa"
{ gaaval->index = GAATMP_index.arg1 ;};
return GAA_OK;
@@ -586,7 +595,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_passwd.arg1, gaa_getstr, GAATMP_passwd.size1);
gaa_index++;
-#line 7 "crypt.gaa"
+#line 17 "crypt.gaa"
{ gaaval->passwd = GAATMP_passwd.arg1 ;};
return GAA_OK;
@@ -596,7 +605,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
GAA_TESTMOREARGS;
GAA_FILL(GAATMP_username.arg1, gaa_getstr, GAATMP_username.size1);
gaa_index++;
-#line 4 "crypt.gaa"
+#line 14 "crypt.gaa"
{ gaaval->username = GAATMP_username.arg1 ;};
return GAA_OK;
@@ -625,7 +634,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
if(inited == 0)
{
-#line 26 "crypt.gaa"
+#line 36 "crypt.gaa"
{ gaaval->username=NULL; gaaval->passwd=NULL; gaaval->salt=0;
gaaval->create_conf=NULL; gaaval->passwd_conf=NULL; gaaval->verify = 0;
gaaval->index = 1; ;};
diff --git a/src/crypt-gaa.h b/src/crypt-gaa.h
index dc14393110..3957425cde 100644
--- a/src/crypt-gaa.h
+++ b/src/crypt-gaa.h
@@ -8,19 +8,19 @@ typedef struct _gaainfo gaainfo;
struct _gaainfo
{
-#line 21 "crypt.gaa"
+#line 31 "crypt.gaa"
char *create_conf;
-#line 18 "crypt.gaa"
+#line 28 "crypt.gaa"
char *passwd_conf;
-#line 15 "crypt.gaa"
+#line 25 "crypt.gaa"
int verify;
-#line 12 "crypt.gaa"
+#line 22 "crypt.gaa"
int salt;
-#line 9 "crypt.gaa"
+#line 19 "crypt.gaa"
int index;
-#line 6 "crypt.gaa"
+#line 16 "crypt.gaa"
char *passwd;
-#line 3 "crypt.gaa"
+#line 13 "crypt.gaa"
char *username;
#line 114 "gaa.skel"
diff --git a/src/crypt.c b/src/crypt.c
index 89ed0797c5..34b745e2ea 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -35,10 +35,10 @@ int main (int argc, char **argv)
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "crypt-gaa.h"
#include <gnutls/gnutls.h>
#include <gnutls/extra.h>
#include <gcrypt.h> /* for randomize */
+#include <crypt-gaa.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -46,6 +46,8 @@ int main (int argc, char **argv)
#ifndef _WIN32
# include <pwd.h>
# include <unistd.h>
+#else
+# include <windows.h>
#endif
#ifdef _WIN32
diff --git a/src/crypt.gaa b/src/crypt.gaa
index 7d8a288bc8..56b47f2391 100644
--- a/src/crypt.gaa
+++ b/src/crypt.gaa
@@ -1,3 +1,13 @@
+#{
+
+/* C declarations */
+
+#ifndef _WIN32
+# include <windows.h>
+#endif
+
+#}
+
helpnode "Srpcrypt help\nUsage : srpcrypt [options]"
#char *username;
View Lorry Controller Status