From 9592bfd0dda7c575de07bce2c7a81b8432d845a4 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 28 Jul 2021 23:45:20 +0000
Subject:  Huge incompatible changes.

- Obsolete skalibs/environ.h and skalibs/getpeereid.h removed.
- rc4 and md5 removed.
- All *_t types renamed to avoid treading on POSIX namespace.
- subgetopt() renamed to lgetopt().
- signal functions reworked; skasigaction removed; sig_stack removed
- Various functions removed: skaoffsetof(), selfpipe_untrap()
- New posixplz function: munmap_void.

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/librandom/random_makeseed.c |  2 +-
 src/librandom/surf.c            |  3 ++-
 src/librandom/surf_init.c       | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/librandom')

diff --git a/src/librandom/random_makeseed.c b/src/librandom/random_makeseed.c
index 61244c6..c15ad5a 100644
--- a/src/librandom/random_makeseed.c
+++ b/src/librandom/random_makeseed.c
@@ -18,7 +18,7 @@ void random_makeseed (char *s)
 {
   SHA1Schedule bak = SHA1_INIT() ;
   {
-    tain_t now ;
+    tain now ;
     char tmp[256] ;
     uint32_t x = getpid() ;
     uint32_pack(tmp, x) ;
diff --git a/src/librandom/surf.c b/src/librandom/surf.c
index d226249..166f3c4 100644
--- a/src/librandom/surf.c
+++ b/src/librandom/surf.c
@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <stdint.h>
+
 #include <skalibs/uint32.h>
 #include <skalibs/surf.h>
 
@@ -14,7 +15,7 @@ static void surfit (SURFSchedule *ctx)
   uint32_t z[8] ;
   uint32_t x ;
   uint32_t sum = 0 ;
-  unsigned int i = 0, loop = 0 ; ;
+  uint32_t i = 0, loop = 0 ; ;
 
   if (!++ctx->in[0] && !++ctx->in[1] && !++ctx->in[2]) ++ctx->in[3] ;
   for (; i < 12 ; i++) t[i] = ctx->in[i] ^ ctx->seed[12+i] ;
diff --git a/src/librandom/surf_init.c b/src/librandom/surf_init.c
index 53abdcc..49abe51 100644
--- a/src/librandom/surf_init.c
+++ b/src/librandom/surf_init.c
@@ -1,13 +1,14 @@
 /* ISC license. */
 
+#include <stdint.h>
+
 #include <skalibs/uint32.h>
 #include <skalibs/surf.h>
 
 void surf_init (SURFSchedule *ctx, char const *s)
 {
-  SURFSchedule zero = SURFSCHEDULE_ZERO ;
-  unsigned int i = 4 ;
-  *ctx = zero ;
-  for (; i < 12 ; i++) uint32_unpack(s + (i<<2) - 16, ctx->in + i) ;
-  for (i = 0 ; i < 32 ; i++) uint32_unpack(s + 32 + (i<<2), ctx->seed + i) ;
+  SURFSchedule z = SURFSCHEDULE_ZERO ;
+  for (uint32_t i = 4 ; i < 12 ; i++) uint32_unpack(s + (i<<2) - 16, z.in + i) ;
+  for (uint32_t i = 0 ; i < 32 ; i++) uint32_unpack(s + 32 + (i<<2), z.seed + i) ;
+  *ctx = z ;
 }
-- 
cgit v1.2.3