Change in libosmocore[master]: Streamline glibc version check
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 07 Jan 2019 15:44:58 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: Streamline glibc version check
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11719 )
Change subject: Streamline glibc version check
..
Streamline glibc version check
* use macro for version check
* report glibc version upon random.h detection
* comment where various #endif belongs to
* explicitly check for embedded build (our target toolchain don't use
libc so there's no point in checking its version)
Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062
---
M src/gsm/gsm_utils.c
1 file changed, 11 insertions(+), 7 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 9eb41fb..14331e5 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -98,15 +98,18 @@
#include "../../config.h"
+#if (!EMBEDDED)
/* FIXME: this can be removed once we bump glibc requirements to 2.25: */
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
+#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "."
OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
#include
#elif HAVE_DECL_SYS_GETRANDOM
#include
#ifndef GRND_NONBLOCK
#define GRND_NONBLOCK 0x0001
-#endif
-#endif
+#endif /* ifndef GRND_NONBLOCK */
+#endif /* if __GLIBC_PREREQ */
+#endif /* !EMBEDDED */
#if (USE_GNUTLS)
#pragma message ("including GnuTLS for getrandom fallback.")
@@ -131,7 +134,8 @@
if (!gnutls_check_version("3.3.0"))
gnutls_global_deinit();
}
-#endif
+
+#endif /* if (USE_GNUTLS) */
/* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
* Greek symbols at hex positions 0x10 and 0x12-0x1a
@@ -441,19 +445,19 @@
/* this function is intended for generating short identifiers only, not
arbitrary-length random data */
if (len > OSMO_MAX_RAND_ID_LEN)
return -E2BIG;
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)
+#if (!EMBEDDED)
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,25)
rc = getrandom(out, len, GRND_NONBLOCK);
#elif HAVE_DECL_SYS_GETRANDOM
#pragma message ("Using direct syscall access for getrandom(): consider
upgrading to glibc >= 2.25")
/* FIXME: this can be removed once we bump glibc requirements to 2.25:
*/
rc = syscall(SYS_getrandom, out, len, GRND_NONBLOCK);
#endif
+#endif /* !EMBEDDED */
/* getrandom() failed entirely: */
if (rc < 0) {
#if (USE_GNUTLS)
-#pragma message ("Secure random failed: using GnuTLS fallback.")
return gnutls_rnd(GNUTLS_RND_RANDOM, out, len);
#endif
return -errno;
--
To view, visit https://gerrit.osmocom.org/11719
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062
Gerrit-Change-Number: 11719
Gerrit-PatchSet: 10
Gerrit-Owner: Max
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: daniel
Change in libosmocore[master]: Streamline glibc version check
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 30 Dec 2018 23:54:55 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: Streamline glibc version check
Max has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check .. Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 30 Dec 2018 15:29:33 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: Streamline glibc version check
Max has uploaded this change for review. ( https://gerrit.osmocom.org/11719
Change subject: Streamline glibc version check
..
Streamline glibc version check
* use macro for version check
* report glibc version upon detection
Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062
---
M src/gsm/gsm_utils.c
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/11719/1
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 7e6c794..be35cd4 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -95,11 +95,12 @@
#include
#include
#include
+#include
#include "../../config.h"
-/* FIXME: this can be removed once we bump glibc requirements to 2.25: */
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25)
+/* FIXME: this can be removed once we bump glibc requirements to 2.25:*/
+#if __GNUC_PREREQ (2,25)
#include
#elif HAVE_DECL_SYS_GETRANDOM
#include
@@ -131,6 +132,8 @@
if (!gnutls_check_version("3.3.0"))
gnutls_global_deinit();
}
+#else
+#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "."
OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected")
#endif
/* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
--
To view, visit https://gerrit.osmocom.org/11719
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062
Gerrit-Change-Number: 11719
Gerrit-PatchSet: 1
Gerrit-Owner: Max
