From cf521f05e235e0ea153e5cc6fb3ffebd2785a423 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 25 Nov 2017 22:18:35 +0100
Subject: [PATCH] Reorder

---
 .../randombytes/salsa20/randombytes_salsa20_random.c       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
index 5bb1d9d7..dd8e2562 100644
--- a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
+++ b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
@@ -330,6 +330,10 @@ randombytes_salsa20_random_stir(void)
         randombytes_salsa20_random_init();
         global.initialized = 1;
     }
+#ifdef HAVE_GETPID
+    global.pid = getpid();
+#endif
+
 #ifndef _WIN32
 
 # ifdef HAVE_SAFE_ARC4RANDOM
@@ -361,9 +365,6 @@ randombytes_salsa20_random_stir(void)
     crypto_stream_salsa20(stream.key, sizeof stream.key,
                           m0 + crypto_stream_salsa20_KEYBYTES, m0);
     sodium_memzero(m0, sizeof m0);
-#ifdef HAVE_GETPID
-    global.pid = getpid();
-#endif
     stream.initialized = 1;
 }