diff options
Diffstat (limited to 'security/stunnel/files')
| -rw-r--r-- | security/stunnel/files/patch-src::client.c | 22 | ||||
| -rw-r--r-- | security/stunnel/files/patch-src::options.c | 42 |
2 files changed, 42 insertions, 22 deletions
diff --git a/security/stunnel/files/patch-src::client.c b/security/stunnel/files/patch-src::client.c deleted file mode 100644 index 8733316dfbdd..000000000000 --- a/security/stunnel/files/patch-src::client.c +++ /dev/null @@ -1,22 +0,0 @@ -Description: Do not pass null pointers to execvp(). -Forwarded: https://stunnel.mirt.net/cgi-bin/bugzilla3/show_bug.cgi?id=2 -Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2009-11-13 - ---- src/client.c.orig -+++ src/client.c -@@ -859,6 +859,14 @@ - sigemptyset(&newmask); - sigprocmask(SIG_SETMASK, &newmask, NULL); - #endif -+ if (c->opt->execargs != NULL && c->opt->execargs[0] == NULL) { -+ free(c->opt->execargs); -+ c->opt->execargs = NULL; -+ } -+ if (c->opt->execargs == NULL) { -+ c->opt->execargs = calloc(2, sizeof(c->opt->execargs[0])); -+ c->opt->execargs[0] = c->opt->execname; -+ } - execvp(c->opt->execname, c->opt->execargs); - ioerror(c->opt->execname); /* execv failed */ - _exit(1); diff --git a/security/stunnel/files/patch-src::options.c b/security/stunnel/files/patch-src::options.c new file mode 100644 index 000000000000..78e15612cbc2 --- /dev/null +++ b/security/stunnel/files/patch-src::options.c @@ -0,0 +1,42 @@ +Description: Build on older OpenSSL versions without some options. +Forwarded: https://stunnel.mirt.net/cgi-bin/bugzilla3/show_bug.cgi?id=3 +Author: Michal Trojnara <Michal.Trojnara@mirt.net> + Peter Pentchev <roam@ringlet.net> +Last-Update: 2009-11-19 + +--- src/options.c.orig ++++ src/options.c +@@ -1136,7 +1136,9 @@ + if(strcasecmp(opt, "sessiond")) + break; + section->option.sessiond=1; ++#ifdef SSL_OP_NO_TICKET + section->ssl_options|=SSL_OP_NO_TICKET; ++#endif + if(!name2addrlist(§ion->sessiond_addr, arg, DEFAULT_LOOPBACK)) + return "Failed to resolve sessiond server address"; + return NULL; /* OK */ +@@ -1704,15 +1706,23 @@ + {"TLS_D5_BUG", SSL_OP_TLS_D5_BUG}, + {"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG}, + {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS}, ++#ifdef SSL_OP_NO_QUERY_MTU + {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU}, ++#endif ++#ifdef SSL_OP_COOKIE_EXCHANGE + {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE}, ++#endif ++#ifdef SSL_OP_NO_TICKET + {"NO_TICKET", SSL_OP_NO_TICKET}, ++#endif + {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION", + SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION}, + #ifdef SSL_OP_NO_COMPRESSION + {"NO_COMPRESSION", SSL_OP_NO_COMPRESSION}, + #endif ++#ifdef SSL_OP_SINGLE_ECDH_USE + {"SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE}, ++#endif + {"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE}, + {"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA}, + {"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE}, |