more fixes for the V= stuff

[openwrt.git] / openwrt / package / mini_httpd / patches / 500-matrixssl.patch

diff --git a/openwrt/package/mini_httpd/patches/500-matrixssl.patch b/openwrt/package/mini_httpd/patches/500-matrixssl.patch
index 54963f3..0ab8d68 100644 (file)
--- a/openwrt/package/mini_httpd/patches/500-matrixssl.patch
+++ b/openwrt/package/mini_httpd/patches/500-matrixssl.patch
@@ -14,11 +14,11 @@ diff -ruN mini_httpd-1.19-orig/Makefile mini_httpd-1.19-3/Makefile
 +#SSL_OBJS =
 +
 +# MatrixSSL
 +#SSL_OBJS =
 +
 +# MatrixSSL

-+SSL_TREE =
-+SSL_DEFS =    -DUSE_SSL -DHAVE_MATRIXSSL
-+SSL_INC =
-+SSL_LIBS =    -lmatrixssl
-+SSL_OBJS =    matrixssl_helper.o
++#SSL_TREE =
++#SSL_DEFS =   -DUSE_SSL -DHAVE_MATRIXSSL
++#SSL_INC =
++#SSL_LIBS =   -lmatrixssl
++#SSL_OBJS =   matrixssl_helper.o

  
  
 -BINDIR =      /usr/local/sbin
  
  
 -BINDIR =      /usr/local/sbin


@@ -123,7 +123,7 @@ diff -ruN mini_httpd-1.19-orig/mini_httpd.c mini_httpd-1.19-3/mini_httpd.c
 +# else /* HAVE_OPENSSL */
 +#  ifdef HAVE_MATRIXSSL
 +      matrixSslOpen();
 +# else /* HAVE_OPENSSL */
 +#  ifdef HAVE_MATRIXSSL
 +      matrixSslOpen();

-+      if ( matrixSslReadKeys( &keys, certfile, certfile, NULL, NULL < 0) )
++      if ( matrixSslReadKeys( &keys, certfile, certfile, NULL, NULL ) < 0 )

 +          {
 +          syslog( LOG_CRIT, "can't load certificate and/or private key\n");
 +          (void) fprintf( stderr, "%s: can't load certificate and/or private key\n", argv0 );
 +          {
 +          syslog( LOG_CRIT, "can't load certificate and/or private key\n");
 +          (void) fprintf( stderr, "%s: can't load certificate and/or private key\n", argv0 );