From 6100ec9e7dc422cca6486555e4d73d0d0af7efd5 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 23 Jan 2008 17:35:54 +0000
Subject: [PATCH] Fix tcptls build when openssl isn't installed
(closes issue #11813)
Reported by: tzafrir
Patches:
asterisk-tcptls.diff.txt uploaded by jamesgolovich (license 176)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/tcptls.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/tcptls.c b/main/tcptls.c
index 98b6d829ea..f9c18ac490 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -83,22 +83,20 @@ static int ssl_close(void *cookie)
HOOK_T server_read(struct server_instance *ser, void *buf, size_t count)
{
- if (!ser->ssl)
- return read(ser->fd, buf, count);
#ifdef DO_SSL
- else
+ if (ser->ssl)
return ssl_read(ser->ssl, buf, count);
#endif
+ return read(ser->fd, buf, count);
}
HOOK_T server_write(struct server_instance *ser, void *buf, size_t count)
{
- if (!ser->ssl)
- return write(ser->fd, buf, count);
#ifdef DO_SSL
- else
+ if (ser->ssl)
return ssl_write(ser->ssl, buf, count);
#endif
+ return write(ser->fd, buf, count);
}
void *server_root(void *data)
@@ -356,9 +354,11 @@ void server_stop(struct server_args *desc)
void *ast_make_file_from_fd(void *data)
{
struct server_instance *ser = data;
+#ifdef DO_SSL
int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept;
int ret;
char err[256];
+#endif
/*
* open a FILE * as appropriate.
--
GitLab