Changeset 21763

Timestamp:

2010-06-12T15:00:55+02:00 (8 years ago)

Author:

jow

Message:

[backfire] merge r21492, r21556 and r21762

Location:

branches/backfire/package/uhttpd

Files:

• Makefile (modified) (1 diff)
• src/uhttpd-tls.c (modified) (1 diff)
• src/uhttpd.c (modified) (1 diff)

branches/backfire/package/uhttpd/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=9
+PKG_RELEASE:=11
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

branches/backfire/package/uhttpd/src/uhttpd-tls.c

@@ -36 +36 @@
 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;
 }
 

branches/backfire/package/uhttpd/src/uhttpd.c

@@ -551 +551 @@
                                 );
 
+                                memset(bind, 0, sizeof(bind));
                                 break;