summaryrefslogtreecommitdiffstats
path: root/package/uhttpd
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-12 12:58:11 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-12 12:58:11 +0000
commit120a23987a3b6152d4688200e23cc98e85b5a261 (patch)
treef87f722897d00068f2d1ef3e9904629fca155366 /package/uhttpd
parent5c835e4d31216d7dd5f0d090f726ee33fc27c8d3 (diff)
[package] uhttpd:
- fix incorrect parsing of multiple listen options (#7458) - support PEM certificates for SSL git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21762 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd')
-rw-r--r--package/uhttpd/Makefile2
-rw-r--r--package/uhttpd/src/uhttpd-tls.c14
-rw-r--r--package/uhttpd/src/uhttpd.c1
3 files changed, 14 insertions, 3 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 3ac396a4b..eb4238c90 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_RELEASE:=10
+PKG_RELEASE:=11
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
diff --git a/package/uhttpd/src/uhttpd-tls.c b/package/uhttpd/src/uhttpd-tls.c
index cb5061638..26143ddf7 100644
--- a/package/uhttpd/src/uhttpd-tls.c
+++ b/package/uhttpd/src/uhttpd-tls.c
@@ -35,12 +35,22 @@ SSL_CTX * uh_tls_ctx_init()
int uh_tls_ctx_cert(SSL_CTX *c, const char *file)
{
- return SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_ASN1);
+ int rv;
+
+ if( (rv = SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_PEM)) < 1 )
+ rv = SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_ASN1);
+
+ return rv;
}
int uh_tls_ctx_key(SSL_CTX *c, const char *file)
{
- return SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_ASN1);
+ int rv;
+
+ if( (rv = SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_PEM)) < 1 )
+ rv = SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_ASN1);
+
+ return rv;
}
void uh_tls_ctx_free(struct listener *l)
diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index 152e0b452..2f77a32a9 100644
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -550,6 +550,7 @@ int main (int argc, char **argv)
&hints, (opt == 's'), &conf
);
+ memset(bind, 0, sizeof(bind));
break;
#ifdef HAVE_TLS