19 Feb
2016
19 Feb
'16
8:54 p.m.
1.) You link against libgnutls-openssl-dev which
provides a wrapper for RAND_bytes.
2.) We move to GNUtls (or gcrypt?) to call the function that RAND_bytes is wrapped around
(after reading the documentation)
3.) We use GNU nettle and their yarrow-256 implementation (assuming that is a smart
move)?
Thanks.
I did #1. Here's the patch:
Index: openbsc/openbsc/configure.ac
===================================================================
--- openbsc.orig/openbsc/configure.ac 2016-02-19 20:39:10.824145024 +0100
+++ openbsc/openbsc/configure.ac 2016-02-19 20:39:10.820145095 +0100
@@ -27,7 +27,8 @@
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0)
PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
-PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
+#PKG_CHECK_MODULES(LIBCRYPTO, gnutls)
+AC_SUBST(LIBCRYPTO_LIBS, -lgnutls-openssl)
# Enabke/disable the NAT?
AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires
SCCP])],
Index: openbsc/openbsc/src/libmsc/auth.c
===================================================================
--- openbsc.orig/openbsc/src/libmsc/auth.c 2016-02-19 20:13:19.417462737 +0100
+++ openbsc/openbsc/src/libmsc/auth.c 2016-02-19 20:40:13.607032169 +0100
@@ -27,7 +27,7 @@
#include <osmocom/gsm/comp128.h>
-#include <openssl/rand.h>
+#include <gnutls/openssl.h>
#include <stdlib.h>
Index: openbsc/openbsc/src/libmsc/db.c
===================================================================
--- openbsc.orig/openbsc/src/libmsc/db.c 2016-02-19 20:13:19.421462672 +0100
+++ openbsc/openbsc/src/libmsc/db.c 2016-02-19 20:40:27.318789122 +0100
@@ -38,7 +38,7 @@
#include <osmocom/core/statistics.h>
#include <osmocom/core/rate_ctr.h>
-#include <openssl/rand.h>
+#include <gnutls/openssl.h>
/* Semi-Private-Interface (SPI) for the subscriber code */
void subscr_direct_free(struct gsm_subscriber *subscr);
Index: openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c
===================================================================
--- openbsc.orig/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:13:19.433462478 +0100
+++ openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:39:58.791294787 +0100
@@ -69,7 +69,7 @@
#include <osmocom/abis/ipa.h>
-#include <openssl/rand.h>
+#include <gnutls/openssl.h>
#include "../../bscconfig.h"
It seems to work.
Luckily the SSL library isn't used for anything advanced.
Cool if you also figure out a way to solve this upstream!
Cheers
Ruben