Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

autoconf: Check for srtp_get_version_string() before using it

Browse Source 
Change-Id: Id2a916ff9448706090e72ff2c7fb3f5ba24a05df
changes/66/10166/1
Sean Bright 7 years ago
parent ad602bb2a8
commit 3d9deb35f0
5 changed files with 251 additions and 7 deletions
Show Stats Download Patch File Download Diff File

234
configure vendored
Unescape View File

@ -762,6 +762,10 @@ PBX_OPENSSL
OPENSSL_DIR
OPENSSL_INCLUDE
OPENSSL_LIB
PBX_SRTP_GET_VERSION
SRTP_GET_VERSION_DIR
SRTP_GET_VERSION_INCLUDE
SRTP_GET_VERSION_LIB
PBX_SRTP_SHUTDOWN
SRTP_SHUTDOWN_DIR
SRTP_SHUTDOWN_INCLUDE
@ -1329,6 +1333,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -1516,6 +1521,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1768,6 +1774,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1905,7 +1920,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -2058,6 +2073,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -12416,6 +12432,18 @@ PBX_SRTP_SHUTDOWN=0
SRTP_GET_VERSION_DESCRIP="SRTP Library Version Function"
SRTP_GET_VERSION_OPTION=srtp
SRTP_GET_VERSION_DIR=${SRTP_DIR}
PBX_SRTP_GET_VERSION=0
OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer"
OPENSSL_OPTION="ssl"
PBX_OPENSSL=0
@ -14768,7 +14796,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -14814,7 +14842,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -14838,7 +14866,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -14883,7 +14911,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -14907,7 +14935,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -16207,6 +16235,8 @@ main ()
if (*(data + i) != *(data3 + i))
return 14;
close (fd);
free (data);
free (data3);
return 0;
}
_ACEOF
@ -31476,6 +31506,102 @@ fi
if test "x${PBX_SRTP_GET_VERSION}" != "x1" -a "${USE_SRTP_GET_VERSION}" != "no"; then
pbxlibdir=""
# if --with-SRTP_GET_VERSION=DIR has been specified, use it.
if test "x${SRTP_GET_VERSION_DIR}" != "x"; then
if test -d ${SRTP_GET_VERSION_DIR}/lib; then
pbxlibdir="-L${SRTP_GET_VERSION_DIR}/lib"
else
pbxlibdir="-L${SRTP_GET_VERSION_DIR}"
fi
fi
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp2" >&5
$as_echo_n "checking for srtp_get_version_string in -lsrtp2... " >&6; }
if ${ac_cv_lib_srtp2_srtp_get_version_string+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsrtp2 ${pbxlibdir} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char srtp_get_version_string ();
int
main ()
{
return srtp_get_version_string ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_srtp2_srtp_get_version_string=yes
else
ac_cv_lib_srtp2_srtp_get_version_string=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_get_version_string" >&5
$as_echo "$ac_cv_lib_srtp2_srtp_get_version_string" >&6; }
if test "x$ac_cv_lib_srtp2_srtp_get_version_string" = xyes; then :
AST_SRTP_GET_VERSION_FOUND=yes
else
AST_SRTP_GET_VERSION_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
# now check for the header.
if test "${AST_SRTP_GET_VERSION_FOUND}" = "yes"; then
SRTP_GET_VERSION_LIB="${pbxlibdir} -lsrtp2 "
# if --with-SRTP_GET_VERSION=DIR has been specified, use it.
if test "x${SRTP_GET_VERSION_DIR}" != "x"; then
SRTP_GET_VERSION_INCLUDE="-I${SRTP_GET_VERSION_DIR}/include"
fi
SRTP_GET_VERSION_INCLUDE="${SRTP_GET_VERSION_INCLUDE} "
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_GET_VERSION_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
if test "x$ac_cv_header_srtp2_srtp_h" = xyes; then :
SRTP_GET_VERSION_HEADER_FOUND=1
else
SRTP_GET_VERSION_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${SRTP_GET_VERSION_HEADER_FOUND}" = "x0" ; then
SRTP_GET_VERSION_LIB=""
SRTP_GET_VERSION_INCLUDE=""
else
PBX_SRTP_GET_VERSION=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_GET_VERSION 1
_ACEOF
fi
fi
fi
# libsrtp2 removed support for PRNG, so we require OpenSSL
if test "x$PBX_OPENSSL" != x1;
then
@ -32015,6 +32141,102 @@ _ACEOF
fi
if test "x${PBX_SRTP_GET_VERSION}" != "x1" -a "${USE_SRTP_GET_VERSION}" != "no"; then
pbxlibdir=""
# if --with-SRTP_GET_VERSION=DIR has been specified, use it.
if test "x${SRTP_GET_VERSION_DIR}" != "x"; then
if test -d ${SRTP_GET_VERSION_DIR}/lib; then
pbxlibdir="-L${SRTP_GET_VERSION_DIR}/lib"
else
pbxlibdir="-L${SRTP_GET_VERSION_DIR}"
fi
fi
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp" >&5
$as_echo_n "checking for srtp_get_version_string in -lsrtp... " >&6; }
if ${ac_cv_lib_srtp_srtp_get_version_string+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsrtp ${pbxlibdir} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char srtp_get_version_string ();
int
main ()
{
return srtp_get_version_string ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_srtp_srtp_get_version_string=yes
else
ac_cv_lib_srtp_srtp_get_version_string=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_get_version_string" >&5
$as_echo "$ac_cv_lib_srtp_srtp_get_version_string" >&6; }
if test "x$ac_cv_lib_srtp_srtp_get_version_string" = xyes; then :
AST_SRTP_GET_VERSION_FOUND=yes
else
AST_SRTP_GET_VERSION_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
# now check for the header.
if test "${AST_SRTP_GET_VERSION_FOUND}" = "yes"; then
SRTP_GET_VERSION_LIB="${pbxlibdir} -lsrtp "
# if --with-SRTP_GET_VERSION=DIR has been specified, use it.
if test "x${SRTP_GET_VERSION_DIR}" != "x"; then
SRTP_GET_VERSION_INCLUDE="-I${SRTP_GET_VERSION_DIR}/include"
fi
SRTP_GET_VERSION_INCLUDE="${SRTP_GET_VERSION_INCLUDE} "
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SRTP_GET_VERSION_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
if test "x$ac_cv_header_srtp_srtp_h" = xyes; then :
SRTP_GET_VERSION_HEADER_FOUND=1
else
SRTP_GET_VERSION_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${SRTP_GET_VERSION_HEADER_FOUND}" = "x0" ; then
SRTP_GET_VERSION_LIB=""
SRTP_GET_VERSION_INCLUDE=""
else
PBX_SRTP_GET_VERSION=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SRTP_GET_VERSION 1
_ACEOF
fi
fi
fi
fi
fi

3
configure.ac
Unescape View File

@ -584,6 +584,7 @@ AST_EXT_LIB_SETUP_OPTIONAL([SRTP_256], [SRTP Library AES-256 (ICM)], [SRTP], [sr
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_192], [SRTP Library AES-192 (ICM)], [SRTP], [srtp])
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_GCM], [SRTP Library AES-128 (GCM) and AES-256 (GCM)], [SRTP], [srtp])
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_SHUTDOWN], [SRTP Library Shutdown Function], [SRTP], [srtp])
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_GET_VERSION], [SRTP Library Version Function], [SRTP], [srtp])
AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL Secure Sockets Layer], [ssl])
AST_EXT_LIB_SETUP_OPTIONAL([RT], [Realtime functions], [rt])
AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
@ -2573,6 +2574,7 @@ then
AST_EXT_LIB_CHECK([SRTP_192], [srtp2], [srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80])
AST_EXT_LIB_CHECK([SRTP_GCM], [srtp2], [srtp_crypto_policy_set_aes_gcm_128_8_auth])
AST_EXT_LIB_CHECK([SRTP_SHUTDOWN], [srtp2], [srtp_shutdown], [srtp2/srtp.h])
AST_EXT_LIB_CHECK([SRTP_GET_VERSION], [srtp2], [srtp_get_version_string], [srtp2/srtp.h])
# libsrtp2 removed support for PRNG, so we require OpenSSL
if test "x$PBX_OPENSSL" != x1;
@ -2607,6 +2609,7 @@ then
AST_EXT_LIB_CHECK([SRTP_192], [srtp], [crypto_policy_set_aes_cm_192_hmac_sha1_80])
AST_EXT_LIB_CHECK([SRTP_GCM], [srtp], [crypto_policy_set_aes_gcm_128_8_auth])
AST_EXT_LIB_CHECK([SRTP_SHUTDOWN], [srtp], [srtp_shutdown], [srtp/srtp.h])
AST_EXT_LIB_CHECK([SRTP_GET_VERSION], [srtp], [srtp_get_version_string], [srtp/srtp.h])
fi
fi

3
include/asterisk/autoconfig.h.in
Unescape View File

@ -905,6 +905,9 @@
feature. */
#undef HAVE_SRTP_GCM
/* Define to 1 if SRTP has the SRTP Library Version Function feature. */
#undef HAVE_SRTP_GET_VERSION
/* Define to 1 if SRTP has the SRTP Library Shutdown Function feature. */
#undef HAVE_SRTP_SHUTDOWN

14
menuselect/configure vendored
Unescape View File

@ -692,6 +692,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -772,6 +773,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@ -1024,6 +1026,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1161,7 +1172,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -1314,6 +1325,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]

4
res/res_srtp.c
Unescape View File

@ -1212,7 +1212,11 @@ static int res_srtp_init(void)
return -1;
}
#ifdef HAVE_SRTP_GET_VERSION
ast_verb(2, "%s initialized\n", srtp_get_version_string());
#else
ast_verb(2, "libsrtp initialized\n");
#endif
g_initialized = 1;
return 0;

Write Preview
Loading…
Cancel
Save