Check-in [6fddc6c891]
Overview
Comment:Removed more unused functions
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 6fddc6c891628019927b6cbcff6210ae13f9e8eaef62a57c5c70dba9c9710bfb
User & Date: rkeene on 2018-06-30 04:17:24
Other Links: manifest | tags
Context
2018-06-30
04:17
Fixed a few configure issues check-in: e9733e0ecf user: rkeene tags: trunk
04:17
Removed more unused functions check-in: 6fddc6c891 user: rkeene tags: trunk
03:55
Added start of autoconf support check-in: 6fe61e3a7a user: rkeene tags: trunk
Changes

Modified tweetnacl/patches/tweetnacl-supercop.diff from [198734fb50] to [822aac2959].

1
2
3


4








5

6




7







8
9



10




11
12
13
14
15
16
17
18
--- a/tweetnacl.c.new
+++ b/tweetnacl.c.new
@@ -516,6 +516,7 @@


   0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL








 };

 




+#ifndef SUPERCOP







 int crypto_hashblocks(u8 *x,const u8 *m,u64 n)
 {



   u64 z[8],b[8],a[8],w[16],t;




@@ -584,6 +585,7 @@
 
   return 0;
 }
+#endif
 
 sv add(gf p[4],gf q[4])
 {


|
>
>
|
>
>
>
>
>
>
>
>
|
>
|
>
>
>
>

>
>
>
>
>
>
>
|

>
>
>
|
>
>
>
>
|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- a/tweetnacl.c.new
+++ b/tweetnacl.c.new
@@ -32,12 +32,14 @@
   return (u<<8)|x[0];
 }
 
+#ifndef SUPERCOP
 static u64 dl64(const u8 *x)
 {
   u64 i,u=0;
   FOR(i,8) u=(u<<8)|x[i];
   return u;
 }
+#endif
 
 sv st32(u8 *x,u32 u)
 {
@@ -45,11 +47,13 @@
   FOR(i,4) { x[i] = u; u >>= 8; }
 }
 
+#ifndef SUPERCOP
 sv ts64(u8 *x,u64 u)
 {
   int i;
   for (i = 7;i >= 0;--i) { x[i] = u; u >>= 8; }
 }
+#endif
 
 static int vn(const u8 *x,const u8 *y,int n)
 {
@@ -484,6 +488,7 @@
   return crypto_box_open_afternm(m,c,d,n,k);
 }
 
+#ifndef SUPERCOP
 static u64 R(u64 x,int c) { return (x >> c) | (x << (64 - c)); }
 static u64 Ch(u64 x,u64 y,u64 z) { return (x & y) ^ (~x & z); }
 static u64 Maj(u64 x,u64 y,u64 z) { return (x & y) ^ (x & z) ^ (y & z); }
@@ -584,6 +589,7 @@
 
   return 0;
 }
+#endif
 
 sv add(gf p[4],gf q[4])
 {