projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] merge r21492, r21556 and r21762
[openwrt-10.03/.git]
/
package
/
uhttpd
/
src
/
uhttpd-tls.c
diff --git
a/package/uhttpd/src/uhttpd-tls.c
b/package/uhttpd/src/uhttpd-tls.c
index cb5061638078c75e919371bb45b5efd3118e8976..26143ddf7108c0c9f084a6036a1fab18b6bdbd3c 100644
(file)
--- 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)
{
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)
{
}
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)
}
void uh_tls_ctx_free(struct listener *l)