Changeset 21762


Ignore:
Timestamp:
2010-06-12T14:58:11+02:00 (8 years ago)
Author:
jow
Message:

[package] uhttpd:

  • fix incorrect parsing of multiple listen options (#7458)
  • support PEM certificates for SSL
Location:
trunk/package/uhttpd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/uhttpd/Makefile

    r21556 r21762  
    99 
    1010PKG_NAME:=uhttpd 
    11 PKG_RELEASE:=10 
     11PKG_RELEASE:=11 
    1212 
    1313PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
  • trunk/package/uhttpd/src/uhttpd-tls.c

    r20428 r21762  
    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 
  • trunk/package/uhttpd/src/uhttpd.c

    r21121 r21762  
    551551                                ); 
    552552 
     553                                memset(bind, 0, sizeof(bind)); 
    553554                                break; 
    554555 
Note: See TracChangeset for help on using the changeset viewer.