fix compilation problems when not having ssl.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@233 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-01-12 16:26:48 +00:00
parent aa173d77f5
commit 2545db37fc
2 changed files with 26 additions and 24 deletions

View file

@ -233,6 +233,8 @@ if test $GCC = yes && test $wall_werror = yes; then
CFLAGS="$CFLAGS -Werror "
fi
AC_CHECK_HEADERS(openssl/hmac.h openssl/md5.h)
AC_CHECK_LIB(ssl,SSL_CTX_new,[SSL_LIBS="-lssl"])
AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="$SSL_LIBS -lcrypto"])

View file

@ -67,6 +67,10 @@
*
*/
#ifdef HAVE_CONFIG_H
#include "ortp-config.h"
#endif
#ifndef _WIN32_WCE
#include <errno.h>
#endif
@ -99,13 +103,9 @@
#endif
//#define NOSSL
/*
#if defined(__sparc__) || defined(WIN32)
#define NOSSL
#endif
#define NOSSL
*/
#if !defined(HAVE_OPENSSL_HMAC_H) || !defined(HAVE_OPENSSL_MD5_H)
#define NOSSL 1
#endif
#include "ortp/stun_udp.h"
#include "ortp/stun.h"
@ -326,23 +326,23 @@ turnParseAtrRequestedTransport( char* body, unsigned int hdrLen, TurnAtrRequest
return TRUE;
}
#ifdef ORTP_BIGENDIAN
#define htonq(n) n
#define ntohq(n) n
#else /* little endian */
static inline UInt64
htonq (UInt64 v)
{
return htonl ((UInt32) (v >> 32))
| (UInt64) htonl ((UInt32) v) << 32;
}
static inline UInt64
ntohq (UInt64 v)
{
return ntohl ((UInt32) (v >> 32))
| (UInt64) ntohl ((UInt32) v) << 32;
}
#endif /* little endian */
#ifdef ORTP_BIGENDIAN
#define htonq(n) n
#define ntohq(n) n
#else /* little endian */
static inline UInt64
htonq (UInt64 v)
{
return htonl ((UInt32) (v >> 32))
| (UInt64) htonl ((UInt32) v) << 32;
}
static inline UInt64
ntohq (UInt64 v)
{
return ntohl ((UInt32) (v >> 32))
| (UInt64) ntohl ((UInt32) v) << 32;
}
#endif /* little endian */
static bool_t
turnParseAtrReservationToken( char* body, unsigned int hdrLen, TurnAtrReservationToken *result )