From 44cbb293088840d5813a69c6dc850b0444c4e27b Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 10 Apr 2016 20:23:18 +0200
Subject: libsec: make #include headers consistent

---
 sys/src/libsec/mkfile            | 4 ++--
 sys/src/libsec/port/aes.c        | 4 +---
 sys/src/libsec/port/aes_gcm.c    | 4 +---
 sys/src/libsec/port/aes_xts.c    | 3 +--
 sys/src/libsec/port/aesgcmtest.c | 2 +-
 sys/src/libsec/port/blowfish.c   | 1 -
 sys/src/libsec/port/ccpoly.c     | 3 +--
 sys/src/libsec/port/chacha.c     | 3 +--
 sys/src/libsec/port/curve25519.c | 3 +--
 sys/src/libsec/port/decodepem.c  | 4 +---
 sys/src/libsec/port/des3CBC.c    | 1 -
 sys/src/libsec/port/des3ECB.c    | 1 -
 sys/src/libsec/port/desCBC.c     | 1 -
 sys/src/libsec/port/desECB.c     | 1 -
 sys/src/libsec/port/fastrand.c   | 5 ++---
 sys/src/libsec/port/genrandom.c  | 1 -
 sys/src/libsec/port/hkdf.c       | 1 -
 sys/src/libsec/port/mkfile       | 3 +--
 sys/src/libsec/port/nfastrand.c  | 3 +--
 sys/src/libsec/port/pbkdf2.c     | 1 -
 sys/src/libsec/port/poly1305.c   | 3 +--
 sys/src/libsec/port/prng.c       | 1 -
 sys/src/libsec/port/readcert.c   | 5 +----
 sys/src/libsec/port/salsa.c      | 3 +--
 sys/src/libsec/port/thumb.c      | 5 +----
 sys/src/libsec/port/tlshand.c    | 4 ++--
 sys/src/libsec/port/tsmemcmp.c   | 3 +--
 27 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/sys/src/libsec/mkfile b/sys/src/libsec/mkfile
index 17bdf915d..a99bea664 100644
--- a/sys/src/libsec/mkfile
+++ b/sys/src/libsec/mkfile
@@ -33,9 +33,9 @@ installall:V:
 	for(objtype in $CPUS) mk $MKFLAGS install
 
 everything:V:
-	rm -f */*.[012456789kqv]
+	rm -f */*.[$OS]
 	for(objtype in $CPUS)@{
 		echo $objtype
 		mk $MKFLAGS install
 	}
-	rm -f */*.[012456789kqv]
+	rm -f */*.[$OS]
diff --git a/sys/src/libsec/port/aes.c b/sys/src/libsec/port/aes.c
index d55621884..4a9e6dd4e 100644
--- a/sys/src/libsec/port/aes.c
+++ b/sys/src/libsec/port/aes.c
@@ -28,9 +28,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <u.h>
-#include <libc.h>
-#include <mp.h>
+#include "os.h"
 #include <libsec.h>
 
 typedef uchar	u8;
diff --git a/sys/src/libsec/port/aes_gcm.c b/sys/src/libsec/port/aes_gcm.c
index 18ea5e1cc..72c6f7141 100644
--- a/sys/src/libsec/port/aes_gcm.c
+++ b/sys/src/libsec/port/aes_gcm.c
@@ -1,6 +1,4 @@
-#include <u.h>
-#include <libc.h>
-#include <mp.h>
+#include "os.h"
 #include <libsec.h>
 
 static void
diff --git a/sys/src/libsec/port/aes_xts.c b/sys/src/libsec/port/aes_xts.c
index ca343d4a1..2e03a1470 100644
--- a/sys/src/libsec/port/aes_xts.c
+++ b/sys/src/libsec/port/aes_xts.c
@@ -1,7 +1,6 @@
 // Author Taru Karttunen <taruti@taruti.net>
 // This file can be used as both Public Domain or Creative Commons CC0.
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 #define AesBlockSize 16
diff --git a/sys/src/libsec/port/aesgcmtest.c b/sys/src/libsec/port/aesgcmtest.c
index 8e8afc656..4ab7edb84 100644
--- a/sys/src/libsec/port/aesgcmtest.c
+++ b/sys/src/libsec/port/aesgcmtest.c
@@ -1,7 +1,7 @@
 #include <u.h>
 #include <libc.h>
-#include <libsec.h>
 #include <mp.h>
+#include <libsec.h>
 
 typedef struct Test Test;
 struct Test
diff --git a/sys/src/libsec/port/blowfish.c b/sys/src/libsec/port/blowfish.c
index d1b803593..b6688c979 100644
--- a/sys/src/libsec/port/blowfish.c
+++ b/sys/src/libsec/port/blowfish.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 // Blowfish block cipher.  See:
diff --git a/sys/src/libsec/port/ccpoly.c b/sys/src/libsec/port/ccpoly.c
index 76162f60f..738e74f1b 100644
--- a/sys/src/libsec/port/ccpoly.c
+++ b/sys/src/libsec/port/ccpoly.c
@@ -1,5 +1,4 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 static void
diff --git a/sys/src/libsec/port/chacha.c b/sys/src/libsec/port/chacha.c
index d3e603a61..27246cb32 100644
--- a/sys/src/libsec/port/chacha.c
+++ b/sys/src/libsec/port/chacha.c
@@ -7,8 +7,7 @@ modified for use in Plan 9 and Inferno (no algorithmic changes),
 and including the changes to block number and nonce defined in RFC7539
 */
 
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 enum{
diff --git a/sys/src/libsec/port/curve25519.c b/sys/src/libsec/port/curve25519.c
index 527b8d8b0..25d88326f 100644
--- a/sys/src/libsec/port/curve25519.c
+++ b/sys/src/libsec/port/curve25519.c
@@ -45,8 +45,7 @@
  * uses many of the tricks described therein. Only the crecip function is taken
  * from the sample implementation.
  */
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 typedef vlong felem;
diff --git a/sys/src/libsec/port/decodepem.c b/sys/src/libsec/port/decodepem.c
index d732b0a34..2f4494714 100644
--- a/sys/src/libsec/port/decodepem.c
+++ b/sys/src/libsec/port/decodepem.c
@@ -1,6 +1,4 @@
-#include <u.h>
-#include <libc.h>
-#include <mp.h>
+#include "os.h"
 #include <libsec.h>
 
 #define STRLEN(s)	(sizeof(s)-1)
diff --git a/sys/src/libsec/port/des3CBC.c b/sys/src/libsec/port/des3CBC.c
index 263293004..59aef6b81 100644
--- a/sys/src/libsec/port/des3CBC.c
+++ b/sys/src/libsec/port/des3CBC.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 // Because of the way that non multiple of 8
diff --git a/sys/src/libsec/port/des3ECB.c b/sys/src/libsec/port/des3ECB.c
index 324254b19..73089b522 100644
--- a/sys/src/libsec/port/des3ECB.c
+++ b/sys/src/libsec/port/des3ECB.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 // I wasn't sure what to do when the buffer was not
diff --git a/sys/src/libsec/port/desCBC.c b/sys/src/libsec/port/desCBC.c
index ecee29e80..a7caf970b 100644
--- a/sys/src/libsec/port/desCBC.c
+++ b/sys/src/libsec/port/desCBC.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 // Because of the way that non multiple of 8
diff --git a/sys/src/libsec/port/desECB.c b/sys/src/libsec/port/desECB.c
index a9ad00185..11bfd5056 100644
--- a/sys/src/libsec/port/desECB.c
+++ b/sys/src/libsec/port/desECB.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 // I wasn't sure what to do when the buffer was not
diff --git a/sys/src/libsec/port/fastrand.c b/sys/src/libsec/port/fastrand.c
index 145712774..421f6cc9a 100644
--- a/sys/src/libsec/port/fastrand.c
+++ b/sys/src/libsec/port/fastrand.c
@@ -1,6 +1,5 @@
-#include	<u.h>
-#include	<libc.h>
-#include	<libsec.h>
+#include "os.h"
+#include <libsec.h>
 
 /* 
  *  use the X917 random number generator to create random
diff --git a/sys/src/libsec/port/genrandom.c b/sys/src/libsec/port/genrandom.c
index 2cbaeb8c4..294111e26 100644
--- a/sys/src/libsec/port/genrandom.c
+++ b/sys/src/libsec/port/genrandom.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 typedef struct State{
diff --git a/sys/src/libsec/port/hkdf.c b/sys/src/libsec/port/hkdf.c
index 6ad32d35b..0b9acfcb2 100644
--- a/sys/src/libsec/port/hkdf.c
+++ b/sys/src/libsec/port/hkdf.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 /* rfc5869 */
diff --git a/sys/src/libsec/port/mkfile b/sys/src/libsec/port/mkfile
index 5ed2d23c0..49d8c7282 100644
--- a/sys/src/libsec/port/mkfile
+++ b/sys/src/libsec/port/mkfile
@@ -51,8 +51,7 @@ UPDATE=mkfile\
 </sys/src/cmd/mksyslib
 
 %.c:D:	%.mp
-	echo '#include <u.h>' > $target
-	echo '#include <libc.h>' >> $target
+	echo '#include "os.h"' > $target
 	echo '#include <mp.h>' >> $target
 	mpc $prereq >> $target
 	
diff --git a/sys/src/libsec/port/nfastrand.c b/sys/src/libsec/port/nfastrand.c
index 3ba77003d..7394a1323 100644
--- a/sys/src/libsec/port/nfastrand.c
+++ b/sys/src/libsec/port/nfastrand.c
@@ -1,5 +1,4 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 #define Maxrand	((1UL<<31)-1)
diff --git a/sys/src/libsec/port/pbkdf2.c b/sys/src/libsec/port/pbkdf2.c
index 7df01dc25..da3a64664 100644
--- a/sys/src/libsec/port/pbkdf2.c
+++ b/sys/src/libsec/port/pbkdf2.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 /* rfc2898 */
diff --git a/sys/src/libsec/port/poly1305.c b/sys/src/libsec/port/poly1305.c
index 0ec15be26..9835d9336 100644
--- a/sys/src/libsec/port/poly1305.c
+++ b/sys/src/libsec/port/poly1305.c
@@ -1,5 +1,4 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 /*
diff --git a/sys/src/libsec/port/prng.c b/sys/src/libsec/port/prng.c
index fc2e508aa..b2e869661 100644
--- a/sys/src/libsec/port/prng.c
+++ b/sys/src/libsec/port/prng.c
@@ -1,5 +1,4 @@
 #include "os.h"
-#include <mp.h>
 #include <libsec.h>
 
 //
diff --git a/sys/src/libsec/port/readcert.c b/sys/src/libsec/port/readcert.c
index 6fdb456ea..90ed884e2 100644
--- a/sys/src/libsec/port/readcert.c
+++ b/sys/src/libsec/port/readcert.c
@@ -1,7 +1,4 @@
-#include <u.h>
-#include <libc.h>
-#include <auth.h>
-#include <mp.h>
+#include "os.h"
 #include <libsec.h>
 
 static char*
diff --git a/sys/src/libsec/port/salsa.c b/sys/src/libsec/port/salsa.c
index ff21036c3..5200f0488 100644
--- a/sys/src/libsec/port/salsa.c
+++ b/sys/src/libsec/port/salsa.c
@@ -1,5 +1,4 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 enum{
diff --git a/sys/src/libsec/port/thumb.c b/sys/src/libsec/port/thumb.c
index 21c92fe88..d8ded8305 100644
--- a/sys/src/libsec/port/thumb.c
+++ b/sys/src/libsec/port/thumb.c
@@ -1,8 +1,5 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <bio.h>
-#include <auth.h>
-#include <mp.h>
 #include <libsec.h>
 
 enum{ ThumbTab = 1<<10 };
diff --git a/sys/src/libsec/port/tlshand.c b/sys/src/libsec/port/tlshand.c
index 785eac83c..4cb37558a 100644
--- a/sys/src/libsec/port/tlshand.c
+++ b/sys/src/libsec/port/tlshand.c
@@ -2563,7 +2563,7 @@ tlsSecInits(int cvers, uchar *csid, int ncsid, uchar *crandom, uchar *ssid, int
 	memmove(sec->crandom, crandom, RandomSize);
 	sec->clientVers = cvers;
 
-	put32(sec->srandom, time(0));
+	put32(sec->srandom, time(nil));
 	genrandom(sec->srandom+4, RandomSize-4);
 	memmove(srandom, sec->srandom, RandomSize);
 
@@ -2626,7 +2626,7 @@ tlsSecInitc(int cvers, uchar *crandom)
 {
 	TlsSec *sec = emalloc(sizeof(*sec));
 	sec->clientVers = cvers;
-	put32(sec->crandom, time(0));
+	put32(sec->crandom, time(nil));
 	genrandom(sec->crandom+4, RandomSize-4);
 	memmove(crandom, sec->crandom, RandomSize);
 	return sec;
diff --git a/sys/src/libsec/port/tsmemcmp.c b/sys/src/libsec/port/tsmemcmp.c
index 6cc75377d..b1d7e3133 100644
--- a/sys/src/libsec/port/tsmemcmp.c
+++ b/sys/src/libsec/port/tsmemcmp.c
@@ -1,5 +1,4 @@
-#include <u.h>
-#include <libc.h>
+#include "os.h"
 #include <libsec.h>
 
 /*
-- 
cgit v1.2.3