Remove the tls source from the build again. We want this to be an optional
dependency and that doesn't work yet. Memory like a sieve.
This commit is contained in:
@@ -40,7 +40,6 @@ Sources = Split("""
|
||||
stanza.c
|
||||
jid.c
|
||||
sock.c
|
||||
tls_gnutls.c
|
||||
hash.c
|
||||
sasl.c
|
||||
sha1.c
|
||||
@@ -53,7 +52,6 @@ Headers = Split("""
|
||||
strophe.h
|
||||
common.h
|
||||
sock.h
|
||||
tls.h
|
||||
hash.h
|
||||
sha1.h
|
||||
md5.h
|
||||
@@ -133,10 +131,10 @@ def testcase_runner(target, source, env):
|
||||
|
||||
testenv = env.Copy()
|
||||
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
||||
testenv.Append(LIBS=['strophe', 'expat', 'gnutls'])
|
||||
testenv.Append(LIBS=['strophe', 'expat'])
|
||||
if testenv["PLATFORM"] == "win32":
|
||||
testenv.Append(LIBS=["winmm", "ws2_32"])
|
||||
testenv.Append(LIBPATH=['.', '/usr/local/lib'])
|
||||
testenv.Append(LIBPATH=['.'])
|
||||
|
||||
import SCons.Node
|
||||
test_builder = Builder(action = testcase_runner,
|
||||
|
||||
75
src/tls_dummy.c
Normal file
75
src/tls_dummy.c
Normal file
@@ -0,0 +1,75 @@
|
||||
/* tls.c
|
||||
** libstrophe XMPP client library -- TLS abstraction dummy impl.
|
||||
**
|
||||
** Copyright (C) 2005 OGG, LCC. All rights reserved.
|
||||
**
|
||||
** This software is provided AS-IS with no warranty, either express
|
||||
** or implied.
|
||||
**
|
||||
** This software is distributed under license and may not be copied,
|
||||
** modified or distributed except as expressly authorized under the
|
||||
** terms of the license contained in the file LICENSE.txt in this
|
||||
** distribution.
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "tls.h"
|
||||
#include "sock.h"
|
||||
|
||||
struct _tls {
|
||||
xmpp_ctx_t *ctx; /* do we need this? */
|
||||
sock_t sock;
|
||||
/* we don't implement anything */
|
||||
};
|
||||
|
||||
void tls_initialize(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void tls_shutdown(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
tls_t *tls_new(xmpp_ctx_t *ctx, sock_t sock)
|
||||
{
|
||||
/* always fail */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void tls_free(tls_t *tls)
|
||||
{
|
||||
return
|
||||
}
|
||||
|
||||
int tls_set_credentials(tls_t *tls, const char *cafilename)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int tls_start(tls_t *tls)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int tls_stop(tls_t *tls)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int tls_error(tls_t *tls)
|
||||
{
|
||||
/* todo: some kind of error polling/dump */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tls_read(tls_t *tls, void * const buff, const size_t len)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
int tls_write(tls_t *tls, const void * const buff, const size_t len)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
Reference in New Issue
Block a user