Change Details
package/uhttpd/Makefile |
8 | 8 | include $(TOPDIR)/rules.mk |
9 | 9 | |
10 | 10 | PKG_NAME:=uhttpd |
11 | | PKG_RELEASE:=9 |
| 11 | PKG_RELEASE:=11 |
12 | 12 | |
13 | 13 | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) |
14 | 14 | |
package/uhttpd/src/uhttpd-tls.c |
35 | 35 | |
36 | 36 | int uh_tls_ctx_cert(SSL_CTX *c, const char *file) |
37 | 37 | { |
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; |
39 | 44 | } |
40 | 45 | |
41 | 46 | int uh_tls_ctx_key(SSL_CTX *c, const char *file) |
42 | 47 | { |
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; |
44 | 54 | } |
45 | 55 | |
46 | 56 | void uh_tls_ctx_free(struct listener *l) |
package/uhttpd/src/uhttpd.c |
550 | 550 | &hints, (opt == 's'), &conf |
551 | 551 | ); |
552 | 552 | |
| 553 | memset(bind, 0, sizeof(bind)); |
553 | 554 | break; |
554 | 555 | |
555 | 556 | #ifdef HAVE_TLS |
Download the corresponding diff file