tls: support specifying accepted TLS ciphers

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 822c74868708173cebad4f56add3063922bce94e..26e74ece57e77d1fb6810025073f53473891751c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -139,6 +139,7 @@ static int usage(const char *name)
                "       -s [addr:]port  Like -p but provide HTTPS on this port\n"
                "       -C file         ASN.1 server certificate file\n"
                "       -K file         ASN.1 server private key file\n"
+               "       -P ciphers      Colon separated list of allowed TLS ciphers\n"
                "       -q              Redirect all HTTP requests to HTTPS\n"
 #endif
                "       -h directory    Specify the document root, default is '.'\n"
@@ -220,6 +221,7 @@ static void fixup_prefix(char *str)
        str[len + 1] = 0;
 }
 
+#ifdef HAVE_LUA
 static void add_lua_prefix(const char *prefix, const char *handler) {
        struct lua_prefix *p;
        char *pprefix, *phandler;
@@ -236,6 +238,7 @@ static void add_lua_prefix(const char *prefix, const char *handler) {
 
        list_add_tail(&p->list, &conf.lua_prefix);
 }
+#endif
 
 int main(int argc, char **argv)
 {
@@ -247,7 +250,7 @@ int main(int argc, char **argv)
        int bound = 0;
 #ifdef HAVE_TLS
        int n_tls = 0;
-       const char *tls_key = NULL, *tls_crt = NULL;
+       const char *tls_key = NULL, *tls_crt = NULL, *tls_ciphers = NULL;
 #endif
 #ifdef HAVE_LUA
        const char *lua_prefix = NULL, *lua_handler = NULL;
@@ -259,7 +262,7 @@ int main(int argc, char **argv)
        init_defaults_pre();
        signal(SIGPIPE, SIG_IGN);
 
-       while ((ch = getopt(argc, argv, "A:aC:c:Dd:E:fh:H:I:i:K:k:L:l:m:N:n:p:qRr:Ss:T:t:U:u:Xx:y:")) != -1) {
+       while ((ch = getopt(argc, argv, "A:aC:c:Dd:E:fh:H:I:i:K:k:L:l:m:N:n:P:p:qRr:Ss:T:t:U:u:Xx:y:")) != -1) {
                switch(ch) {
 #ifdef HAVE_TLS
                case 'C':
@@ -270,6 +273,10 @@ int main(int argc, char **argv)
                        tls_key = optarg;
                        break;
 
+               case 'P':
+                       tls_ciphers = optarg;
+                       break;
+
                case 'q':
                        conf.tls_redirect = 1;
                        break;
@@ -280,6 +287,7 @@ int main(int argc, char **argv)
 #else
                case 'C':
                case 'K':
+               case 'P':
                case 'q':
                case 's':
                        fprintf(stderr, "uhttpd: TLS support not compiled, "
@@ -521,7 +529,7 @@ int main(int argc, char **argv)
                        return 1;
                }
 
-               if (uh_tls_init(tls_key, tls_crt))
+               if (uh_tls_init(tls_key, tls_crt, tls_ciphers))
                    return 1;
        }
 #endif