<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11719">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Streamline glibc version check<br><br>* use macro for version check<br>* report glibc version upon random.h detection<br>* comment where various #endif belongs to<br>* explicitly check for embedded build (our target toolchain don't use<br> libc so there's no point in checking its version)<br><br>Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062<br>---<br>M src/gsm/gsm_utils.c<br>1 file changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c</span><br><span>index 9eb41fb..14331e5 100644</span><br><span>--- a/src/gsm/gsm_utils.c</span><br><span>+++ b/src/gsm/gsm_utils.c</span><br><span>@@ -98,15 +98,18 @@</span><br><span> </span><br><span> #include "../../config.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if (!EMBEDDED)</span><br><span> /* FIXME: this can be removed once we bump glibc requirements to 2.25: */</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")</span><br><span> #include <sys/random.h></span><br><span> #elif HAVE_DECL_SYS_GETRANDOM</span><br><span> #include <sys/syscall.h></span><br><span> #ifndef GRND_NONBLOCK</span><br><span> #define GRND_NONBLOCK 0x0001</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ifndef GRND_NONBLOCK */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* if __GLIBC_PREREQ */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* !EMBEDDED */</span><br><span> </span><br><span> #if (USE_GNUTLS)</span><br><span> #pragma message ("including GnuTLS for getrandom fallback.")</span><br><span>@@ -131,7 +134,8 @@</span><br><span> if (!gnutls_check_version("3.3.0"))</span><br><span> gnutls_global_deinit();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* if (USE_GNUTLS) */</span><br><span> </span><br><span> /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet</span><br><span> * Greek symbols at hex positions 0x10 and 0x12-0x1a</span><br><span>@@ -441,19 +445,19 @@</span><br><span> /* this function is intended for generating short identifiers only, not arbitrary-length random data */</span><br><span> if (len > OSMO_MAX_RAND_ID_LEN)</span><br><span> return -E2BIG;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)</span><br><span style="color: hsl(120, 100%, 40%);">+#if (!EMBEDDED)</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)</span><br><span> rc = getrandom(out, len, GRND_NONBLOCK);</span><br><span> #elif HAVE_DECL_SYS_GETRANDOM</span><br><span> #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25")</span><br><span> /* FIXME: this can be removed once we bump glibc requirements to 2.25: */</span><br><span> rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* !EMBEDDED */</span><br><span> </span><br><span> /* getrandom() failed entirely: */</span><br><span> if (rc < 0) {</span><br><span> #if (USE_GNUTLS)</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma message ("Secure random failed: using GnuTLS fallback.")</span><br><span> return gnutls_rnd(GNUTLS_RND_RANDOM, out, len);</span><br><span> #endif</span><br><span> return -errno;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11719">change 11719</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11719"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 </div>
<div style="display:none"> Gerrit-Change-Number: 11719 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>