update to 5.31

OK kili@
This commit is contained in:
gsoares 2016-04-24 12:07:48 +00:00
parent b864c0b022
commit 4c7e0e3b0e
5 changed files with 18 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.82 2016/03/11 20:28:31 naddy Exp $
# $OpenBSD: Makefile,v 1.83 2016/04/24 12:07:48 gsoares Exp $
COMMENT= SSL encryption wrapper for standard network daemons
DISTNAME= stunnel-5.29
DISTNAME= stunnel-5.31
CATEGORIES= security
MAINTAINER= Gleydson Soares <gsoares@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (stunnel-5.29.tar.gz) = Q5CWJUA+pjT6fLg5nVj6+OfxHBt7KQl0kUaZUfVt9VE=
SIZE (stunnel-5.29.tar.gz) = 637806
SHA256 (stunnel-5.31.tar.gz) = p0a3GrPcbCPqyw2vc0JGeHDkOskzQwkF6xsdBQu64Lc=
SIZE (stunnel-5.31.tar.gz) = 639381

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_ctx_c,v 1.2 2015/12/04 01:38:56 gsoares Exp $
--- src/ctx.c.orig Mon Nov 30 11:15:43 2015
+++ src/ctx.c Thu Dec 3 19:26:54 2015
@@ -351,7 +351,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
$OpenBSD: patch-src_ctx_c,v 1.3 2016/04/24 12:07:48 gsoares Exp $
--- src/ctx.c.orig Fri Feb 19 16:18:43 2016
+++ src/ctx.c Thu Apr 21 21:59:31 2016
@@ -363,7 +363,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
/**************************************** initialize OpenSSL CONF */
NOEXPORT int conf_init(SERVICE_OPTIONS *section) {

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_options_c,v 1.5 2016/01/13 12:39:55 gsoares Exp $
$OpenBSD: patch-src_options_c,v 1.6 2016/04/24 12:07:48 gsoares Exp $
use SSLv23_client_method() required to build with libressl since that it haven't
TLS_client_method() for now.
--- src/options.c.orig Tue Jan 5 06:20:12 2016
+++ src/options.c Tue Jan 12 19:57:30 2016
@@ -2559,7 +2559,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
--- src/options.c.orig Fri Jan 15 13:45:23 2016
+++ src/options.c Thu Apr 21 21:59:31 2016
@@ -2579,7 +2579,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
/* sslVersion */
switch(cmd) {
case CMD_BEGIN:
@ -14,7 +14,7 @@ TLS_client_method() for now.
section->client_method=(SSL_METHOD *)TLS_client_method();
section->server_method=(SSL_METHOD *)TLS_server_method();
#else
@@ -2571,7 +2571,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
@@ -2591,7 +2591,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
if(strcasecmp(opt, "sslVersion"))
break;
if(!strcasecmp(arg, "all")) {

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_verify_c,v 1.2 2015/10/14 02:05:06 gsoares Exp $
$OpenBSD: patch-src_verify_c,v 1.3 2016/04/24 12:07:48 gsoares Exp $
disable OpenSSL 1.0.2 X509_check_* functions, so it can build with libressl.
--- src/verify.c.orig Wed Sep 23 07:00:08 2015
+++ src/verify.c Tue Oct 6 05:52:42 2015
--- src/verify.c.orig Fri Feb 19 16:18:43 2016
+++ src/verify.c Thu Apr 21 21:59:31 2016
@@ -51,7 +51,7 @@ NOEXPORT int add_dir_lookup(X509_STORE *, char *);
NOEXPORT int verify_callback(int, X509_STORE_CTX *);
NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
@ -14,7 +14,7 @@ disable OpenSSL 1.0.2 X509_check_* functions, so it can build with libressl.
NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
NOEXPORT int cert_check_local(X509_STORE_CTX *);
@@ -280,7 +280,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
@@ -274,7 +274,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
}
if(depth==0) { /* additional peer certificate checks */
@ -23,7 +23,7 @@ disable OpenSSL 1.0.2 X509_check_* functions, so it can build with libressl.
if(!cert_check_subject(c, callback_ctx))
return 0; /* reject */
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
@@ -291,7 +291,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
@@ -285,7 +285,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
return 1; /* accept */
}