tls: avoid unnecessary changes to POSIX build

Calls to tls_error_die() embed the line number of the error in the
binary.  Since some lines had been added to tls.c for the WIN32
port a POSIX build of the busybox-w32 source differed from upstream.

Avoid this by pushing the special handling of /dev/urandom down into
open_read_close().  tls.c is now unchanged from upstream.

The only differences in the POSIX build reported by 'objdump -s'
are now the GNU build id, the copyright date and the date of the
configuration.

2 files changed, 7 insertions, 6 deletions

diff --git a/libbb/read.c b/libbb/read.c
index a342506a8..2e4317cd5 100644
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -73,7 +73,14 @@ ssize_t FAST_FUNC read_close(int fd, void *buf, size_t size)
 
 ssize_t FAST_FUNC open_read_close(const char *filename, void *buf, size_t size)
 {
+#if !ENABLE_PLATFORM_MINGW32
         int fd = open(filename, O_RDONLY);
+#else
+        int fd, flag;
+
+        flag = O_RDONLY | (get_dev_type(filename) == DEV_URANDOM ? O_SPECIAL : 0);
+        fd = mingw_open(filename, flag);
+#endif
         if (fd < 0)
                 return fd;
         return read_close(fd, buf, size);
diff --git a/networking/tls.c b/networking/tls.c
index 869456a6a..e34acd69f 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -349,14 +349,8 @@ static void dump_tls_record(const void *vp, int len)
 
 void FAST_FUNC tls_get_random(void *buf, unsigned len)
 {
-#if !ENABLE_PLATFORM_MINGW32
         if (len != open_read_close("/dev/urandom", buf, len))
                 xfunc_die();
-#else
-        int fd = mingw_open("/dev/urandom", O_RDONLY|O_SPECIAL);
-        if (fd < 0 || len != read_close(fd, buf, len))
-                xfunc_die();
-#endif
 }
 
 static void xorbuf3(void *dst, const void *src1, const void *src2, unsigned count)