Migrate from OpenSSL to osmo_get_rand_id()
This avoids potential licensing incompatibility and makes integration of Debian packaging patches easier. Change-Id: Ia57bf1300525cf3c247284fe966b1c415c2d53e2 Related: OS#1694
This commit is contained in:
parent
630df7d608
commit
f682f817a7
|
@ -46,7 +46,6 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5)
|
|||
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0)
|
||||
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
|
||||
PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version?
|
||||
PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
|
||||
PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 0.0.1)
|
||||
PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2)
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ Build-Depends: debhelper (>=9),
|
|||
pkg-config,
|
||||
python-minimal,
|
||||
libdbi-dev,
|
||||
libssl-dev,
|
||||
libsctp-dev,
|
||||
libtalloc-dev,
|
||||
libasn1c-dev,
|
||||
|
|
|
@ -14,7 +14,6 @@ AM_CFLAGS = \
|
|||
$(LIBOSMOABIS_CFLAGS) \
|
||||
$(LIBOSMONETIF_CFLAGS) \
|
||||
$(LIBOSMOLEGACYMGCP_CFLAGS) \
|
||||
$(LIBCRYPTO_CFLAGS) \
|
||||
$(COVERAGE_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
|
@ -55,7 +54,6 @@ osmo_bsc_nat_LDADD = \
|
|||
$(LIBOSMONETIF_LIBS) \
|
||||
$(LIBOSMOSIGTRAN_LIBS) \
|
||||
$(LIBOSMOLEGACYMGCP_LIBS) \
|
||||
$(LIBCRYPTO_LIBS) \
|
||||
$(LIBRARY_GSM) \
|
||||
-lrt \
|
||||
$(NULL)
|
||||
|
|
|
@ -74,8 +74,6 @@
|
|||
|
||||
#include <osmocom/abis/ipa.h>
|
||||
|
||||
#include <openssl/rand.h>
|
||||
|
||||
#include "../../bscconfig.h"
|
||||
|
||||
#define SCCP_CLOSE_TIME 20
|
||||
|
@ -221,7 +219,7 @@ static void send_id_req(struct bsc_nat *nat, struct bsc_connection *bsc)
|
|||
buf = v_put(buf, 0x23);
|
||||
mrand = bsc->last_rand;
|
||||
|
||||
if (RAND_bytes(mrand, 16) != 1)
|
||||
if (osmo_get_rand_id(mrand, 16) < 0)
|
||||
goto failed_random;
|
||||
|
||||
memcpy(buf, mrand, 16);
|
||||
|
|
|
@ -29,6 +29,5 @@ channel_test_LDADD = \
|
|||
$(top_builddir)/src/libcommon/libcommon.a \
|
||||
$(LIBOSMOCORE_LIBS) \
|
||||
$(LIBOSMOGSM_LIBS) \
|
||||
$(LIBCRYPTO_LIBS) \
|
||||
-ldbi \
|
||||
$(NULL)
|
||||
|
|
Loading…
Reference in New Issue