X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fssl-gnutls.c;h=24c87525e02ed18fc4f223f23ae7a7eae3fa60b2;hp=e27d31462e2b738836987379dd6e51d05737cfd8;hb=5f0c1cd631b9abcca90afe15cf129babba86f7f1;hpb=26902200a8061d8e9211e5104abbf2acc84ed7b9

diff --git a/src/ssl-gnutls.c b/src/ssl-gnutls.c
index e27d314..24c8752 100644
--- a/src/ssl-gnutls.c
+++ b/src/ssl-gnutls.c
@@ -67,7 +67,117 @@ struct sslconn {
     struct charbuf in;
 };
 
-static gnutls_dh_params_t dhparams;
+struct savedsess {
+    struct savedsess *next, *prev;
+    gnutls_datum_t key, value;
+};
+
+static int numconn = 0, numsess = 0;
+static struct btree *sessidx = NULL;
+static struct savedsess *sesslistf = NULL, *sesslistl = NULL;
+
+static int sesscmp(void *ap, void *bp)
+{
+    struct savedsess *a = ap, *b = bp;
+    
+    if(a->key.size != b->key.size)
+	return(a->key.size - b->key.size);
+    return(memcmp(a->key.data, b->key.data, a->key.size));
+}
+
+static gnutls_datum_t sessdbfetch(void *uudata, gnutls_datum_t key)
+{
+    struct savedsess *sess, lkey;
+    gnutls_datum_t ret;
+    
+    memset(&ret, 0, sizeof(ret));
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL)
+	return(ret);
+    ret.data = memcpy(gnutls_malloc(ret.size = sess->value.size), sess->value.data, sess->value.size);
+    return(ret);
+}
+
+static void freesess(struct savedsess *sess)
+{
+    bbtreedel(&sessidx, sess, sesscmp);
+    if(sess->next)
+	sess->next->prev = sess->prev;
+    if(sess->prev)
+	sess->prev->next = sess->next;
+    if(sess == sesslistf)
+	sesslistf = sess->next;
+    if(sess == sesslistl)
+	sesslistl = sess->prev;
+    free(sess->key.data);
+    free(sess->value.data);
+    free(sess);
+    numsess--;
+}
+
+static int sessdbdel(void *uudata, gnutls_datum_t key)
+{
+    struct savedsess *sess, lkey;
+    
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL)
+	return(-1);
+    freesess(sess);
+    return(0);
+}
+
+static void cleansess(void)
+{
+    while(numsess > (max(numconn, 1) * 100))
+	freesess(sesslistl);
+}
+
+static int sessdbstore(void *uudata, gnutls_datum_t key, gnutls_datum_t value)
+{
+    static int cc = 0;
+    struct savedsess *sess, lkey;
+    
+    if((value.data == NULL) || (value.size == 0)) {
+	sessdbdel(NULL, key);
+	return(0);
+    }
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL) {
+	omalloc(sess);
+	sess->key.data = memcpy(smalloc(sess->key.size = key.size), key.data, key.size);
+	sess->value.data = memcpy(smalloc(sess->value.size = value.size), value.data, value.size);
+	bbtreeput(&sessidx, sess, sesscmp);
+	sess->prev = NULL;
+	sess->next = sesslistf;
+	if(sesslistf)
+	    sesslistf->prev = sess;
+	sesslistf = sess;
+	if(sesslistl == NULL)
+	    sesslistl = sess;
+	numsess++;
+    } else {
+	free(sess->value.data);
+	sess->value.data = memcpy(smalloc(sess->value.size = value.size), value.data, value.size);
+	if(sess != sesslistf) {
+	    if(sess->next)
+		sess->next->prev = sess->prev;
+	    if(sess->prev)
+		sess->prev->next = sess->next;
+	    if(sess == sesslistl)
+		sesslistl = sess->prev;
+	    sess->prev = NULL;
+	    sess->next = sesslistf;
+	    if(sesslistf)
+		sesslistf->prev = sess;
+	    sesslistf = sess;
+	}
+    }
+    if(cc++ > 100) {
+	cleansess();
+	cc = 0;
+    }
+    return(0);
+}
 
 static int tlsblock(int fd, gnutls_session_t sess, time_t to)
 {
@@ -138,6 +248,9 @@ static ssize_t sslwrite(void *cookie, const char *buf, size_t len)
 
 static int sslclose(void *cookie)
 {
+    struct sslconn *ssl = cookie;
+    
+    buffree(ssl->in);
     return(0);
 }
 
@@ -209,9 +322,14 @@ static void servessl(struct muth *muth, va_list args)
 	return(0);
     }
 
+    numconn++;
     fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
     gnutls_init(&sess, GNUTLS_SERVER);
     gnutls_set_default_priority(sess);
+    gnutls_db_set_retrieve_function(sess, sessdbfetch);
+    gnutls_db_set_store_function(sess, sessdbstore);
+    gnutls_db_set_remove_function(sess, sessdbdel);
+    gnutls_db_set_ptr(sess, NULL);
     gnutls_handshake_set_post_client_hello_function(sess, setcreds);
     gnutls_transport_set_ptr(sess, (gnutls_transport_ptr_t)(intptr_t)fd);
     while((ret = gnutls_handshake(sess)) != 0) {
@@ -235,6 +353,7 @@ static void servessl(struct muth *muth, va_list args)
 out:
     gnutls_deinit(sess);
     close(fd);
+    numconn--;
 }
 
 static void listenloop(struct muth *muth, va_list args)
@@ -260,6 +379,23 @@ out:
     free(pd);
 }
 
+static gnutls_dh_params_t dhparams(void)
+{
+    static int inited = 0;
+    static gnutls_dh_params_t pars;
+    int ret;
+    
+    if(!inited) {
+	if(((ret = gnutls_dh_params_init(&pars)) != 0) ||
+	   ((ret = gnutls_dh_params_generate2(pars, 2048)) != 0)) {
+	    flog(LOG_ERR, "GnuTLS could not generate Diffie-Hellman parameters: %s", gnutls_strerror(ret));
+	    exit(1);
+	}
+	inited = 1;
+    }
+    return(pars);
+}
+
 static void init(void)
 {
     static int inited = 0;
@@ -272,11 +408,6 @@ static void init(void)
 	flog(LOG_ERR, "could not initialize GnuTLS: %s", gnutls_strerror(ret));
 	exit(1);
     }
-    if(((ret = gnutls_dh_params_init(&dhparams)) != 0) ||
-       ((ret = gnutls_dh_params_generate2(dhparams, 2048)) != 0)) {
-	flog(LOG_ERR, "GnuTLS could not generate Diffie-Hellman parameters: %s", gnutls_strerror(ret));
-	exit(1);
-    }
 }
 
 static struct namedcreds *readncreds(char *file)
@@ -346,7 +477,7 @@ static struct namedcreds *readncreds(char *file)
 	flog(LOG_ERR, "ssl: could not use certificate from %s: %s", file, gnutls_strerror(ret));
 	exit(1);
     }
-    gnutls_certificate_set_dh_params(nc->creds, dhparams);
+    gnutls_certificate_set_dh_params(nc->creds, dhparams());
     return(nc);
 }
 
@@ -398,11 +529,24 @@ void handlegnussl(int argc, char **argp, char **argv)
 	    printf("\tcrl=CRL-FILE    [no default]\n");
 	    printf("\t\tThe name of a file to read revocation lists from.\n");
 	    printf("\t\tMay be given multiple times.\n");
+	    printf("\tncert=CERT-FILE [no default]\n");
+	    printf("\t\tThe name of a file to read a named certificate from,\n");
+	    printf("\t\tfor use with SNI-enabled clients.\n");
+	    printf("\t\tMay be given multiple times.\n");
+	    printf("\tncertdir=DIR    [no default]\n");
+	    printf("\t\tRead all *.crt files in the given directory as if they\n");
+	    printf("\t\twere given with `ncert' options.\n");
+	    printf("\t\tMay be given multiple times.\n");
 	    printf("\tport=PORT       [443]\n");
 	    printf("\t\tThe TCP port to listen on.\n");
 	    printf("\n");
 	    printf("\tAll X.509 data files must be PEM-encoded.\n");
-	    printf("\tSee the manpage for information on specifying multiple\n\tcertificates to support SNI operation.\n");
+	    printf("\tIf any certificates were given with `ncert' options, they will be\n");
+	    printf("\tused if a client explicitly names one of them with a\n");
+	    printf("\tserver-name indication. If a client indicates no server name,\n");
+	    printf("\tor if a server-name indication does not match any given\n");
+	    printf("\tcertificate, the certificate given with the `cert' option will\n");
+	    printf("\tbe used instead.\n");
 	    exit(0);
 	} else if(!strcmp(argp[i], "cert")) {
 	    crtfile = argv[i];
@@ -445,17 +589,17 @@ void handlegnussl(int argc, char **argp, char **argv)
 	flog(LOG_ERR, "ssl: needs certificate file at the very least");
 	exit(1);
     }
+    if((fd = listensock6(port)) < 0) {
+	flog(LOG_ERR, "could not listen on IPv6 port (port %i): %s", port, strerror(errno));
+	exit(1);
+    }
     if(keyfile == NULL)
 	keyfile = crtfile;
     if((ret = gnutls_certificate_set_x509_key_file(creds, crtfile, keyfile, GNUTLS_X509_FMT_PEM)) != 0) {
 	flog(LOG_ERR, "ssl: could not load certificate or key: %s", gnutls_strerror(ret));
 	exit(1);
     }
-    gnutls_certificate_set_dh_params(creds, dhparams);
-    if((fd = listensock6(port)) < 0) {
-	flog(LOG_ERR, "could not listen on IPv6 port (port %i): %s", port, strerror(errno));
-	exit(1);
-    }
+    gnutls_certificate_set_dh_params(creds, dhparams());
     bufadd(ncreds, NULL);
     omalloc(pd);
     pd->fd = fd;