diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 10:17:41 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 10:17:41 +0000 |
commit | f228636c02dc1bcb88704933b7e2049a31116d13 (patch) | |
tree | 2d923ac0acd8300f6e9f13f3fd0c85287565699e /methods/connect.cc | |
parent | Releasing progress-linux version 2.7.13-0.0~progress7.99u1. (diff) | |
download | apt-f228636c02dc1bcb88704933b7e2049a31116d13.tar.xz apt-f228636c02dc1bcb88704933b7e2049a31116d13.zip |
Merging upstream version 2.7.14.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'methods/connect.cc')
-rw-r--r-- | methods/connect.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/methods/connect.cc b/methods/connect.cc index 110f2fc..f3e199d 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -19,8 +19,10 @@ #include <apt-pkg/srvrec.h> #include <apt-pkg/strutl.h> +#ifdef HAVE_GNUTLS #include <gnutls/gnutls.h> #include <gnutls/x509.h> +#endif #include <cerrno> #include <cstdio> @@ -798,7 +800,8 @@ ResultState UnwrapSocks(std::string Host, int Port, URI Proxy, std::unique_ptr<M return ResultState::SUCCESSFUL; } - /*}}}*/ + +#ifdef HAVE_GNUTLS /*}}}*/ // UnwrapTLS - Handle TLS connections /*{{{*/ // --------------------------------------------------------------------- /* Performs a TLS handshake on the socket */ @@ -1050,4 +1053,4 @@ ResultState UnwrapTLS(std::string const &Host, std::unique_ptr<MethodFd> &Fd, return ResultState::SUCCESSFUL; } - /*}}}*/ +#endif /*}}}*/ |