aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2012-11-12 14:45:38 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2012-11-12 14:45:38 +0000
commite1d3f986ddad6140a25f3feffc9e28da8fc2318d (patch)
tree6161cb4a8fbf8303ebe3e922b186f919a81e138a
parent536dfa1e71dd9fbe90ea5be8b5b327ae2fed95fd (diff)
Remove ssl_bogus.c, it really shouldn't be used anymore since it builds a
next-to-useless binary.
-rwxr-xr-xconfigure18
-rw-r--r--lib/ssl_bogus.c76
2 files changed, 2 insertions, 92 deletions
diff --git a/configure b/configure
index c1d64dd1..b6d7baa9 100755
--- a/configure
+++ b/configure
@@ -90,7 +90,7 @@ Option Description Default
Disable/enable Skype support $skype
--events=... Event handler (glib, libevent) $events
---ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto)
+--ssl=... SSL library to use (gnutls, nss, openssl, auto)
$ssl
@@ -433,19 +433,6 @@ elif [ "$ssl" = "openssl" ]; then
echo 'EFLAGS+=-lssl -lcrypto' >> Makefile.settings
ret=1
-elif [ "$ssl" = "bogus" ]; then
- echo
- echo 'Using bogus SSL code. This means some features will not work properly.'
-
- ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
- if [ "$msn" = "1" -o "$yahoo" = "1" ]; then
- echo
- echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
- msn=0
- yahoo=0
- fi
-
- ret=1
else
echo
echo 'ERROR: Unknown SSL library specified.'
@@ -456,8 +443,7 @@ if [ "$ret" = "0" ]; then
echo
echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
echo ' Please note that this script doesn'\''t have detection code for OpenSSL,'
- echo ' so if you want to use that, you have to select it by hand. If you don'\''t'
- echo ' need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)'
+ echo ' so if you want to use that, you have to select it by hand.'
exit 1
fi;
diff --git a/lib/ssl_bogus.c b/lib/ssl_bogus.c
deleted file mode 100644
index e134201d..00000000
--- a/lib/ssl_bogus.c
+++ /dev/null
@@ -1,76 +0,0 @@
- /********************************************************************\
- * BitlBee -- An IRC to other IM-networks gateway *
- * *
- * Copyright 2002-2004 Wilmer van der Gaast and others *
- \********************************************************************/
-
-/* SSL module - dummy version */
-
-/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
- if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "ssl_client.h"
-
-int ssl_errno;
-
-void ssl_init( void )
-{
-}
-
-void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
-{
- return( NULL );
-}
-
-int ssl_read( void *conn, char *buf, int len )
-{
- return( -1 );
-}
-
-int ssl_write( void *conn, const char *buf, int len )
-{
- return( -1 );
-}
-
-void ssl_disconnect( void *conn_ )
-{
-}
-
-int ssl_getfd( void *conn )
-{
- return( -1 );
-}
-
-void *ssl_starttls( int fd, char *hostname, gboolean verify, ssl_input_function func, gpointer data )
-{
- return NULL;
-}
-
-b_input_condition ssl_getdirection( void *conn )
-{
- return B_EV_IO_READ;
-}
-
-int ssl_pending( void *conn )
-{
- return 0;
-}
-
-char *ssl_verify_strerror( int code )
-{
- return NULL;
-}