Date:2010-06-12 15:00:55 (13 years 9 months ago)
Author:jow
Commit:cb8ef040093b9be51905eec713d6a76aec8160ab
Message:[backfire] merge r21492, r21556 and r21762

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21763 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: package/uhttpd/Makefile (1 diff)
package/uhttpd/src/uhttpd-tls.c (1 diff)
package/uhttpd/src/uhttpd.c (1 diff)

Change Details

package/uhttpd/Makefile
88include $(TOPDIR)/rules.mk
99
1010PKG_NAME:=uhttpd
11PKG_RELEASE:=9
11PKG_RELEASE:=11
1212
1313PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
1414
package/uhttpd/src/uhttpd-tls.c
3535
3636int uh_tls_ctx_cert(SSL_CTX *c, const char *file)
3737{
38    return SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_ASN1);
38    int rv;
39
40    if( (rv = SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_PEM)) < 1 )
41        rv = SSL_CTX_use_certificate_file(c, file, SSL_FILETYPE_ASN1);
42
43    return rv;
3944}
4045
4146int uh_tls_ctx_key(SSL_CTX *c, const char *file)
4247{
43    return SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_ASN1);
48    int rv;
49
50    if( (rv = SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_PEM)) < 1 )
51        rv = SSL_CTX_use_PrivateKey_file(c, file, SSL_FILETYPE_ASN1);
52
53    return rv;
4454}
4555
4656void uh_tls_ctx_free(struct listener *l)
package/uhttpd/src/uhttpd.c
550550                    &hints, (opt == 's'), &conf
551551                );
552552
553                memset(bind, 0, sizeof(bind));
553554                break;
554555
555556#ifdef HAVE_TLS

Archive Download the corresponding diff file



interactive