Added feature to specify ecc private keys and certificates.

diff --git a/doc/credentials/gnutls-http-serv b/doc/credentials/gnutls-http-serv
index 65b3f78b2c6a59569286d44414ba9673ed7c55fe..312ee18daf6cae7cb1f5ba7939f98d4dbfdeb8c8 100755 (executable)
--- a/doc/credentials/gnutls-http-serv
+++ b/doc/credentials/gnutls-http-serv
@@ -1,7 +1,8 @@
 #! /bin/sh
 
-../../src/gnutls-serv --http --x509certfile x509/cert.pem --x509keyfile x509/key.pem --x509cafile x509/ca.pem \
+../../src/gnutls-serv --http --x509certfile x509/cert-rsa.pem --x509keyfile x509/key-rsa.pem --x509cafile x509/ca.pem \
        --x509dsacertfile x509/cert-dsa.pem --x509dsakeyfile x509/key-dsa.pem   \
+       --x509ecccertfile x509/cert-ecc.pem --x509ecckeyfile x509/key-ecc.pem   \
        --srppasswd srp/tpasswd --srppasswdconf srp/tpasswd.conf \
        --pgpkeyfile openpgp/sec.asc --pgpcertfile openpgp/pub.asc --pskpasswd psk-passwd.txt \
        --dhparams params.pem $*

diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index 5acb1d959be06a2c2ddb71df9099db60d75b7b0b..b8b4f3e2bcafdf5fdf6172fa9e2bc49cff855651 100644 (file)
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -147,6 +147,8 @@ void gaa_help(void)
        __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file or PKCS #11 URL to use.");
        __gaa_helpsingle(0, "x509dsakeyfile", "FILE ", "Alternative X.509 key file to use.");
        __gaa_helpsingle(0, "x509dsacertfile", "FILE ", "Alternative X.509 certificate file to use.");
+       __gaa_helpsingle(0, "x509ecckeyfile", "FILE ", "Alternative X.509 key file to use.");
+       __gaa_helpsingle(0, "x509ecccertfile", "FILE ", "Alternative X.509 certificate file to use.");
        __gaa_helpsingle('r', "require-cert", "", "Require a valid certificate.");
        __gaa_helpsingle('a', "disable-client-cert", "", "Disable request for a client certificate.");
        __gaa_helpsingle(0, "pskpasswd", "FILE ", "PSK password file to use.");
@@ -171,20 +173,24 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 94 "serv.gaa"
+#line 100 "serv.gaa"
        char *priorities;
-#line 91 "serv.gaa"
+#line 97 "serv.gaa"
        char *srp_passwd_conf;
-#line 88 "serv.gaa"
+#line 94 "serv.gaa"
        char *srp_passwd;
-#line 85 "serv.gaa"
+#line 91 "serv.gaa"
        char *psk_hint;
-#line 82 "serv.gaa"
+#line 88 "serv.gaa"
        char *psk_passwd;
-#line 79 "serv.gaa"
+#line 85 "serv.gaa"
        int disable_client_cert;
-#line 76 "serv.gaa"
+#line 82 "serv.gaa"
        int require_cert;
+#line 79 "serv.gaa"
+       char *x509_ecccertfile;
+#line 76 "serv.gaa"
+       char *x509_ecckeyfile;
 #line 73 "serv.gaa"
        char *x509_dsacertfile;
 #line 70 "serv.gaa"
@@ -281,7 +287,7 @@ static int gaa_error = 0;
 #define GAA_MULTIPLE_OPTION     3
 
 #define GAA_REST                0
-#define GAA_NB_OPTION           32
+#define GAA_NB_OPTION           34
 #define GAAOPTID_version       1
 #define GAAOPTID_help  2
 #define GAAOPTID_list  3
@@ -292,28 +298,30 @@ static int gaa_error = 0;
 #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_mtu   23
-#define GAAOPTID_udp   24
-#define GAAOPTID_echo  25
-#define GAAOPTID_http  26
-#define GAAOPTID_noticket      27
-#define GAAOPTID_nodb  28
-#define GAAOPTID_quiet 29
-#define GAAOPTID_port  30
-#define GAAOPTID_generate      31
-#define GAAOPTID_debug 32
+#define GAAOPTID_x509ecccertfile       11
+#define GAAOPTID_x509ecckeyfile        12
+#define GAAOPTID_x509dsacertfile       13
+#define GAAOPTID_x509dsakeyfile        14
+#define GAAOPTID_x509certfile  15
+#define GAAOPTID_x509keyfile   16
+#define GAAOPTID_pgpsubkey     17
+#define GAAOPTID_pgpcertfile   18
+#define GAAOPTID_pgpkeyfile    19
+#define GAAOPTID_pgpkeyring    20
+#define GAAOPTID_x509crlfile   21
+#define GAAOPTID_x509cafile    22
+#define GAAOPTID_x509fmtder    23
+#define GAAOPTID_dhparams      24
+#define GAAOPTID_mtu   25
+#define GAAOPTID_udp   26
+#define GAAOPTID_echo  27
+#define GAAOPTID_http  28
+#define GAAOPTID_noticket      29
+#define GAAOPTID_nodb  30
+#define GAAOPTID_quiet 31
+#define GAAOPTID_port  32
+#define GAAOPTID_generate      33
+#define GAAOPTID_debug 34
 
 #line 168 "gaa.skel"
 
@@ -530,6 +538,18 @@ struct GAAOPTION_pskpasswd
        int size1;
 };
 
+struct GAAOPTION_x509ecccertfile 
+{
+       char* arg1;
+       int size1;
+};
+
+struct GAAOPTION_x509ecckeyfile 
+{
+       char* arg1;
+       int size1;
+};
+
 struct GAAOPTION_x509dsacertfile 
 {
        char* arg1;
@@ -648,6 +668,8 @@ static int gaa_get_option_num(char *str, int status)
                        GAA_CHECK1STR("", GAAOPTID_srppasswd);
                        GAA_CHECK1STR("", GAAOPTID_pskhint);
                        GAA_CHECK1STR("", GAAOPTID_pskpasswd);
+                       GAA_CHECK1STR("", GAAOPTID_x509ecccertfile);
+                       GAA_CHECK1STR("", GAAOPTID_x509ecckeyfile);
                        GAA_CHECK1STR("", GAAOPTID_x509dsacertfile);
                        GAA_CHECK1STR("", GAAOPTID_x509dsakeyfile);
                        GAA_CHECK1STR("", GAAOPTID_x509certfile);
@@ -691,6 +713,8 @@ static int gaa_get_option_num(char *str, int status)
                        GAA_CHECKSTR("pskpasswd", GAAOPTID_pskpasswd);
                        GAA_CHECKSTR("disable-client-cert", GAAOPTID_disable_client_cert);
                        GAA_CHECKSTR("require-cert", GAAOPTID_require_cert);
+                       GAA_CHECKSTR("x509ecccertfile", GAAOPTID_x509ecccertfile);
+                       GAA_CHECKSTR("x509ecckeyfile", GAAOPTID_x509ecckeyfile);
                        GAA_CHECKSTR("x509dsacertfile", GAAOPTID_x509dsacertfile);
                        GAA_CHECKSTR("x509dsakeyfile", GAAOPTID_x509dsakeyfile);
                        GAA_CHECKSTR("x509certfile", GAAOPTID_x509certfile);
@@ -730,6 +754,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
        struct GAAOPTION_srppasswd GAATMP_srppasswd;
        struct GAAOPTION_pskhint GAATMP_pskhint;
        struct GAAOPTION_pskpasswd GAATMP_pskpasswd;
+       struct GAAOPTION_x509ecccertfile GAATMP_x509ecccertfile;
+       struct GAAOPTION_x509ecckeyfile GAATMP_x509ecckeyfile;
        struct GAAOPTION_x509dsacertfile GAATMP_x509dsacertfile;
        struct GAAOPTION_x509dsakeyfile GAATMP_x509dsakeyfile;
        struct GAAOPTION_x509certfile GAATMP_x509certfile;
@@ -766,21 +792,21 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     {
        case GAAOPTID_version:
        OK = 0;
-#line 100 "serv.gaa"
+#line 106 "serv.gaa"
 { serv_version(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_help:
        OK = 0;
-#line 98 "serv.gaa"
+#line 104 "serv.gaa"
 { gaa_help(); exit(0); ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_list:
        OK = 0;
-#line 97 "serv.gaa"
+#line 103 "serv.gaa"
 { print_list(0); exit(0); ;};
 
                return GAA_OK;
@@ -790,7 +816,7 @@ 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 95 "serv.gaa"
+#line 101 "serv.gaa"
 { gaaval->priorities = GAATMP_priority.arg1 ;};
 
                return GAA_OK;
@@ -800,7 +826,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
                GAA_TESTMOREARGS;
                GAA_FILL(GAATMP_srppasswdconf.arg1, gaa_getstr, GAATMP_srppasswdconf.size1);
                gaa_index++;
-#line 92 "serv.gaa"
+#line 98 "serv.gaa"
 { gaaval->srp_passwd_conf = GAATMP_srppasswdconf.arg1 ;};
 
                return GAA_OK;
@@ -810,7 +836,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
                GAA_TESTMOREARGS;
                GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr, GAATMP_srppasswd.size1);
                gaa_index++;
-#line 89 "serv.gaa"
+#line 95 "serv.gaa"
 { gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;};
 
                return GAA_OK;
@@ -820,7 +846,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
                GAA_TESTMOREARGS;
                GAA_FILL(GAATMP_pskhint.arg1, gaa_getstr, GAATMP_pskhint.size1);
                gaa_index++;
-#line 86 "serv.gaa"
+#line 92 "serv.gaa"
 { gaaval->psk_hint = GAATMP_pskhint.arg1 ;};
 
                return GAA_OK;
@@ -830,23 +856,43 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
                GAA_TESTMOREARGS;
                GAA_FILL(GAATMP_pskpasswd.arg1, gaa_getstr, GAATMP_pskpasswd.size1);
                gaa_index++;
-#line 83 "serv.gaa"
+#line 89 "serv.gaa"
 { gaaval->psk_passwd = GAATMP_pskpasswd.arg1 ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_disable_client_cert:
        OK = 0;
-#line 80 "serv.gaa"
+#line 86 "serv.gaa"
 { gaaval->disable_client_cert = 1 ;};
 
                return GAA_OK;
                break;
        case GAAOPTID_require_cert:
        OK = 0;
-#line 77 "serv.gaa"
+#line 83 "serv.gaa"
 { gaaval->require_cert = 1 ;};
 
+               return GAA_OK;
+               break;
+       case GAAOPTID_x509ecccertfile:
+       OK = 0;
+               GAA_TESTMOREARGS;
+               GAA_FILL(GAATMP_x509ecccertfile.arg1, gaa_getstr, GAATMP_x509ecccertfile.size1);
+               gaa_index++;
+#line 80 "serv.gaa"
+{ gaaval->x509_ecccertfile = GAATMP_x509ecccertfile.arg1 ;};
+
+               return GAA_OK;
+               break;
+       case GAAOPTID_x509ecckeyfile:
+       OK = 0;
+               GAA_TESTMOREARGS;
+               GAA_FILL(GAATMP_x509ecckeyfile.arg1, gaa_getstr, GAATMP_x509ecckeyfile.size1);
+               gaa_index++;
+#line 77 "serv.gaa"
+{ gaaval->x509_ecckeyfile = GAATMP_x509ecckeyfile.arg1 ;};
+
                return GAA_OK;
                break;
        case GAAOPTID_x509dsacertfile:
@@ -1069,11 +1115,12 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     if(inited == 0)
     {
 
-#line 104 "serv.gaa"
+#line 110 "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;
        gaaval->x509_dsakeyfile=NULL; gaaval->x509_dsacertfile=NULL; 
+       gaaval->x509_ecckeyfile=NULL; gaaval->x509_ecccertfile=NULL; 
        gaaval->srp_passwd=NULL; gaaval->srp_passwd_conf=NULL; gaaval->quiet = 0;
        gaaval->pgp_keyring=NULL; gaaval->fmtder = 0;
        gaaval->disable_client_cert = 0; gaaval->priorities = NULL;

diff --git a/src/serv-gaa.h b/src/serv-gaa.h
index ef0ab641b04c8308b80ae12906dcd6f6515a3c4d..76263819b952d55f82e4136dd02e07d6668059b9 100644 (file)
--- a/src/serv-gaa.h
+++ b/src/serv-gaa.h
@@ -8,20 +8,24 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 94 "serv.gaa"
+#line 100 "serv.gaa"
        char *priorities;
-#line 91 "serv.gaa"
+#line 97 "serv.gaa"
        char *srp_passwd_conf;
-#line 88 "serv.gaa"
+#line 94 "serv.gaa"
        char *srp_passwd;
-#line 85 "serv.gaa"
+#line 91 "serv.gaa"
        char *psk_hint;
-#line 82 "serv.gaa"
+#line 88 "serv.gaa"
        char *psk_passwd;
-#line 79 "serv.gaa"
+#line 85 "serv.gaa"
        int disable_client_cert;
-#line 76 "serv.gaa"
+#line 82 "serv.gaa"
        int require_cert;
+#line 79 "serv.gaa"
+       char *x509_ecccertfile;
+#line 76 "serv.gaa"
+       char *x509_ecckeyfile;
 #line 73 "serv.gaa"
        char *x509_dsacertfile;
 #line 70 "serv.gaa"

diff --git a/src/serv.c b/src/serv.c
index 32eb9da2e5c2199dbc11266554af9fbe860241c4..b02e8ff4e5cdcf12cfa848f82d0c9c37ed3e5795 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -76,6 +76,8 @@ char *x509_keyfile;
 char *x509_certfile;
 char *x509_dsakeyfile;
 char *x509_dsacertfile;
+char *x509_ecckeyfile;
+char *x509_ecccertfile;
 char *x509_cafile;
 char *dh_params_file;
 char *x509_crlfile = NULL;
@@ -1047,6 +1049,16 @@ main (int argc, char **argv)
         exit (1);
       }
 
+  if (x509_ecccertfile != NULL)
+    if ((ret = gnutls_certificate_set_x509_key_file
+         (cert_cred, x509_ecccertfile, x509_ecckeyfile, x509ctype)) < 0)
+      {
+        fprintf (stderr, "Error reading '%s' or '%s'\n",
+                 x509_ecccertfile, x509_ecckeyfile);
+        GERR (ret);
+        exit (1);
+      }
+
   gnutls_certificate_set_params_function (cert_cred, get_params);
 /*     gnutls_certificate_set_dh_params(cert_cred, dh_params);
  *     gnutls_certificate_set_rsa_export_params(cert_cred, rsa_params);
@@ -1549,6 +1561,8 @@ gaa_parser (int argc, char **argv)
   x509_keyfile = info.x509_keyfile;
   x509_dsacertfile = info.x509_dsacertfile;
   x509_dsakeyfile = info.x509_dsakeyfile;
+  x509_ecccertfile = info.x509_ecccertfile;
+  x509_ecckeyfile = info.x509_ecckeyfile;
   x509_cafile = info.x509_cafile;
   x509_crlfile = info.x509_crlfile;
   pgp_certfile = info.pgp_certfile;

diff --git a/src/serv.gaa b/src/serv.gaa
index b6f018fb134f99fa0c8ba1a849cf3eee68171f1b..c4427ae54cc8984122c5c1f747e81835dadac7a2 100644 (file)
--- a/src/serv.gaa
+++ b/src/serv.gaa
@@ -73,6 +73,12 @@ option (x509dsakeyfile) STR "FILE" { $x509_dsakeyfile = $1 } "Alternative X.509
 #char *x509_dsacertfile;
 option (x509dsacertfile) STR "FILE" { $x509_dsacertfile = $1 } "Alternative X.509 certificate file to use."
 
+#char *x509_ecckeyfile;
+option (x509ecckeyfile) STR "FILE" { $x509_ecckeyfile = $1 } "Alternative X.509 key file to use."
+
+#char *x509_ecccertfile;
+option (x509ecccertfile) STR "FILE" { $x509_ecccertfile = $1 } "Alternative X.509 certificate file to use."
+
 #int require_cert;
 option (r, require-cert) { $require_cert = 1 } "Require a valid certificate."
 
@@ -105,6 +111,7 @@ init { $generate=0; $port=5556; $http=0; $nodb = 0; $noticket = 0;
        $x509_cafile = NULL; $pgp_keyfile=NULL; $pgp_certfile=NULL;
        $x509_keyfile=NULL; $x509_certfile=NULL; $x509_crlfile = NULL;
        $x509_dsakeyfile=NULL; $x509_dsacertfile=NULL; 
+       $x509_ecckeyfile=NULL; $x509_ecccertfile=NULL; 
        $srp_passwd=NULL; $srp_passwd_conf=NULL; $quiet = 0;
        $pgp_keyring=NULL; $fmtder = 0;
        $disable_client_cert = 0; $priorities = NULL;