added my Recipes
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Wed, 1 Nov 2017 09:23:41 -0400
|
||||
Subject: [PATCH] stunnel: fix compile error when openssl disable des support
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
When openssl disable des support with configure option 'no-des', it doesn't
|
||||
provide des related header file and functions. That causes stunnel compile
|
||||
failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related
|
||||
library conditionaly.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
---
|
||||
src/common.h | 2 ++
|
||||
src/protocol.c | 6 +++---
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/common.h b/src/common.h
|
||||
index bc37eb5..03ee3e5 100644
|
||||
--- a/src/common.h
|
||||
+++ b/src/common.h
|
||||
@@ -486,7 +486,9 @@ extern char *sys_errlist[];
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
#include <openssl/md4.h>
|
||||
#endif /* !defined(OPENSSL_NO_MD4) */
|
||||
+#ifndef OPENSSL_NO_DES
|
||||
#include <openssl/des.h>
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_DH
|
||||
#include <openssl/dh.h>
|
||||
#if OPENSSL_VERSION_NUMBER<0x10100000L
|
||||
diff --git a/src/protocol.c b/src/protocol.c
|
||||
index 804f115..d9b2b50 100644
|
||||
--- a/src/protocol.c
|
||||
+++ b/src/protocol.c
|
||||
@@ -66,7 +66,7 @@ NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||
NOEXPORT char *ldap_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||
NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||
NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
|
||||
-#ifndef OPENSSL_NO_MD4
|
||||
+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
|
||||
NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
|
||||
NOEXPORT char *ntlm1(void);
|
||||
NOEXPORT char *ntlm3(char *, char *, char *, char *);
|
||||
@@ -1351,7 +1351,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
||||
fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
|
||||
if(opt->protocol_username && opt->protocol_password) {
|
||||
if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
|
||||
-#ifndef OPENSSL_NO_MD4
|
||||
+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
|
||||
ntlm(c, opt);
|
||||
#else
|
||||
s_log(LOG_ERR, "NTLM authentication is not available");
|
||||
@@ -1395,7 +1395,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-#ifndef OPENSSL_NO_MD4
|
||||
+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
|
||||
|
||||
/*
|
||||
* NTLM code is based on the following documentation:
|
||||
@@ -0,0 +1,33 @@
|
||||
SUMMARY = "Program for providing universal TLS/SSL tunneling service"
|
||||
DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server."
|
||||
HOMEPAGE = "https://www.stunnel.org/"
|
||||
SECTION = "net"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.md;md5=b4988f33f70b383b3011c4ede0a679ce"
|
||||
|
||||
DEPENDS = "autoconf-archive libnsl2 openssl"
|
||||
|
||||
SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
|
||||
file://fix-openssl-no-des.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "1ff7d9f30884c75b98c8a0a4e1534fa79adcada2322635e6787337b4e38fdb81"
|
||||
|
||||
inherit autotools bash-completion pkgconfig
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} libwrap"
|
||||
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
|
||||
PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
|
||||
PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
|
||||
|
||||
EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips"
|
||||
|
||||
# When cross compiling, configure defaults to nobody, but provides no option to change it.
|
||||
EXTRA_OEMAKE += "DEFAULT_GROUP='nogroup'"
|
||||
|
||||
# stunnel3 is a Perl wrapper to allow use of the legacy stunnel 3.x commandline
|
||||
# syntax with stunnel >= 4.05
|
||||
PACKAGES =+ "stunnel3"
|
||||
FILES:stunnel3 = "${bindir}/stunnel3"
|
||||
RDEPENDS:stunnel3 += "${PN} perl"
|
||||
Reference in New Issue
Block a user