summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-04 18:28:10 +0100
committerFelix Fietkau <nbd@openwrt.org>2013-01-04 18:29:03 +0100
commit119244d9b13e84eb898f9fb97e83cac260c1a0b5 (patch)
tree25ebecfa7b835f50f80fc65aa846880b0a988680 /main.c
parent70e4f40d0dd3f58da107789abc4ada1a40b91c42 (diff)
add basic tls support, todo: error handling
Diffstat (limited to 'main.c')
-rw-r--r--main.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/main.c b/main.c
index ce5123b..ab6fbb0 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@
#include <libubox/usock.h>
#include "uhttpd.h"
+#include "tls.h"
char uh_buf[4096];
@@ -190,11 +191,13 @@ static void fixup_prefix(char *str)
int main(int argc, char **argv)
{
+ const char *tls_key, *tls_crt;
bool nofork = false;
char *port;
int opt, ch;
int cur_fd;
int bound = 0;
+ int n_tls = 0;
BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
@@ -207,6 +210,7 @@ int main(int argc, char **argv)
switch(ch) {
case 's':
+ n_tls++;
tls = true;
/* fall through */
case 'p':
@@ -324,6 +328,13 @@ int main(int argc, char **argv)
conf.file = optarg;
break;
+ case 'C':
+ tls_crt = optarg;
+ break;
+
+ case 'K':
+ tls_key = optarg;
+ break;
default:
return usage(argv[0]);
}
@@ -336,6 +347,22 @@ int main(int argc, char **argv)
return 1;
}
+ if (n_tls) {
+ if (!tls_crt || !tls_key) {
+ fprintf(stderr, "Please specify a certificate and "
+ "a key file to enable SSL support\n");
+ return 1;
+ }
+
+#ifdef HAVE_TLS
+ if (uh_tls_init(tls_key, tls_crt))
+ return 1;
+#else
+ fprintf(stderr, "Error: TLS support not compiled in.\n");
+ return 1;
+#endif
+ }
+
/* fork (if not disabled) */
if (!nofork) {
switch (fork()) {