Skip to content

Commit 35bcd4e

Browse files
deatildeatil
committed
更新
1 parent 81cc2c6 commit 35bcd4e

File tree

33 files changed

+212
-745
lines changed

33 files changed

+212
-745
lines changed

‎cipher/anubis/utils.go

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,12 @@ import (
44
"encoding/binary"
55
)
66

7-
// Endianness option
8-
const littleEndian bool = false
9-
107
func getu32(ptr []byte) uint32 {
11-
if littleEndian {
12-
return binary.LittleEndian.Uint32(ptr)
13-
} else {
14-
return binary.BigEndian.Uint32(ptr)
15-
}
8+
return binary.BigEndian.Uint32(ptr)
169
}
1710

1811
func putu32(ptr []byte, a uint32) {
19-
if littleEndian {
20-
binary.LittleEndian.PutUint32(ptr, a)
21-
} else {
22-
binary.BigEndian.PutUint32(ptr, a)
23-
}
12+
binary.BigEndian.PutUint32(ptr, a)
2413
}
2514

2615
func getu32Bytes(a uint32) []byte {
@@ -37,11 +26,7 @@ func bytesToUint32s(b []byte) []uint32 {
3726
for i := 0; i < size; i++ {
3827
j := i * 4
3928

40-
if littleEndian {
41-
dst[i] = binary.LittleEndian.Uint32(b[j:])
42-
} else {
43-
dst[i] = binary.BigEndian.Uint32(b[j:])
44-
}
29+
dst[i] = binary.BigEndian.Uint32(b[j:])
4530
}
4631

4732
return dst
@@ -54,11 +39,7 @@ func uint32sToBytes(w []uint32) []byte {
5439
for i := 0; i < len(w); i++ {
5540
j := i * 4
5641

57-
if littleEndian {
58-
binary.LittleEndian.PutUint32(dst[j:], w[i])
59-
} else {
60-
binary.BigEndian.PutUint32(dst[j:], w[i])
61-
}
42+
binary.BigEndian.PutUint32(dst[j:], w[i])
6243
}
6344

6445
return dst

‎cipher/anubis2/utils.go

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,12 @@ import (
44
"encoding/binary"
55
)
66

7-
// Endianness option
8-
const littleEndian bool = false
9-
107
func getu32(ptr []byte) uint32 {
11-
if littleEndian {
12-
return binary.LittleEndian.Uint32(ptr)
13-
} else {
14-
return binary.BigEndian.Uint32(ptr)
15-
}
8+
return binary.BigEndian.Uint32(ptr)
169
}
1710

1811
func putu32(ptr []byte, a uint32) {
19-
if littleEndian {
20-
binary.LittleEndian.PutUint32(ptr, a)
21-
} else {
22-
binary.BigEndian.PutUint32(ptr, a)
23-
}
12+
binary.BigEndian.PutUint32(ptr, a)
2413
}
2514

2615
func getu32Bytes(a uint32) []byte {
@@ -37,11 +26,7 @@ func bytesToUint32s(b []byte) []uint32 {
3726
for i := 0; i < size; i++ {
3827
j := i * 4
3928

40-
if littleEndian {
41-
dst[i] = binary.LittleEndian.Uint32(b[j:])
42-
} else {
43-
dst[i] = binary.BigEndian.Uint32(b[j:])
44-
}
29+
dst[i] = binary.BigEndian.Uint32(b[j:])
4530
}
4631

4732
return dst
@@ -54,11 +39,7 @@ func uint32sToBytes(w []uint32) []byte {
5439
for i := 0; i < len(w); i++ {
5540
j := i * 4
5641

57-
if littleEndian {
58-
binary.LittleEndian.PutUint32(dst[j:], w[i])
59-
} else {
60-
binary.BigEndian.PutUint32(dst[j:], w[i])
61-
}
42+
binary.BigEndian.PutUint32(dst[j:], w[i])
6243
}
6344

6445
return dst

‎cipher/aria/utils.go

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ import (
55
"encoding/binary"
66
)
77

8-
// Endianness option
9-
const littleEndian bool = false
10-
118
func keyToUint32s(b []byte) []uint32 {
129
size := len(b) / 4
1310
dst := make([]uint32, size)
1411

1512
for i := 0; i < size; i++ {
1613
j := i * 4
1714

18-
if littleEndian {
19-
dst[i] = binary.LittleEndian.Uint32(b[j:])
20-
} else {
21-
dst[i] = binary.BigEndian.Uint32(b[j:])
22-
}
15+
dst[i] = binary.BigEndian.Uint32(b[j:])
2316
}
2417

2518
return dst
@@ -28,35 +21,21 @@ func keyToUint32s(b []byte) []uint32 {
2821
func bytesToUint32s(inp []byte) []uint32 {
2922
blk := make([]uint32, 4)
3023

31-
if littleEndian {
32-
blk[0] = binary.LittleEndian.Uint32(inp[0:])
33-
blk[1] = binary.LittleEndian.Uint32(inp[4:])
34-
blk[2] = binary.LittleEndian.Uint32(inp[8:])
35-
blk[3] = binary.LittleEndian.Uint32(inp[12:])
36-
} else {
37-
blk[0] = binary.BigEndian.Uint32(inp[0:])
38-
blk[1] = binary.BigEndian.Uint32(inp[4:])
39-
blk[2] = binary.BigEndian.Uint32(inp[8:])
40-
blk[3] = binary.BigEndian.Uint32(inp[12:])
41-
}
24+
blk[0] = binary.BigEndian.Uint32(inp[0:])
25+
blk[1] = binary.BigEndian.Uint32(inp[4:])
26+
blk[2] = binary.BigEndian.Uint32(inp[8:])
27+
blk[3] = binary.BigEndian.Uint32(inp[12:])
4228

4329
return blk
4430
}
4531

4632
func uint32sToBytes(blk []uint32) []byte {
4733
sav := make([]byte, 16)
4834

49-
if littleEndian {
50-
binary.LittleEndian.PutUint32(sav[0:], blk[0])
51-
binary.LittleEndian.PutUint32(sav[4:], blk[1])
52-
binary.LittleEndian.PutUint32(sav[8:], blk[2])
53-
binary.LittleEndian.PutUint32(sav[12:], blk[3])
54-
} else {
55-
binary.BigEndian.PutUint32(sav[0:], blk[0])
56-
binary.BigEndian.PutUint32(sav[4:], blk[1])
57-
binary.BigEndian.PutUint32(sav[8:], blk[2])
58-
binary.BigEndian.PutUint32(sav[12:], blk[3])
59-
}
35+
binary.BigEndian.PutUint32(sav[0:], blk[0])
36+
binary.BigEndian.PutUint32(sav[4:], blk[1])
37+
binary.BigEndian.PutUint32(sav[8:], blk[2])
38+
binary.BigEndian.PutUint32(sav[12:], blk[3])
6039

6140
return sav
6241
}

‎cipher/ascon/utils.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,12 @@ import (
55
"encoding/binary"
66
)
77

8-
// Endianness option
9-
const littleEndian bool = false
10-
118
func getu64(ptr []byte) uint64 {
12-
if littleEndian {
13-
return binary.LittleEndian.Uint64(ptr)
14-
} else {
15-
return binary.BigEndian.Uint64(ptr)
16-
}
9+
return binary.BigEndian.Uint64(ptr)
1710
}
1811

1912
func putu64(ptr []byte, a uint64) {
20-
if littleEndian {
21-
binary.LittleEndian.PutUint64(ptr, a)
22-
} else {
23-
binary.BigEndian.PutUint64(ptr, a)
24-
}
13+
binary.BigEndian.PutUint64(ptr, a)
2514
}
2615

2716
func pad(n int) uint64 {
@@ -37,6 +26,7 @@ func be64n(b []byte) uint64 {
3726
for i := len(b) - 1; i >= 0; i-- {
3827
x |= uint64(b[i]) << (56 - i*8)
3928
}
29+
4030
return x
4131
}
4232

‎cipher/camellia/utils.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,12 @@ import (
55
"encoding/binary"
66
)
77

8-
// Endianness option
9-
const littleEndian bool = false
10-
118
func getu64(ptr []byte) uint64 {
12-
if littleEndian {
13-
return binary.LittleEndian.Uint64(ptr)
14-
} else {
15-
return binary.BigEndian.Uint64(ptr)
16-
}
9+
return binary.BigEndian.Uint64(ptr)
1710
}
1811

1912
func putu64(ptr []byte, a uint64) {
20-
if littleEndian {
21-
binary.LittleEndian.PutUint64(ptr, a)
22-
} else {
23-
binary.BigEndian.PutUint64(ptr, a)
24-
}
13+
binary.BigEndian.PutUint64(ptr, a)
2514
}
2615

2716
func rotl128(k [2]uint64, rot uint) (hi, lo uint64) {

‎cipher/cast/utils.go

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ import (
55
"encoding/binary"
66
)
77

8-
// Endianness option
9-
const littleEndian bool = false
10-
118
func keyToUint32s(b []byte) []uint32 {
129
size := len(b) / 4
1310
dst := make([]uint32, size)
1411

1512
for i := 0; i < size; i++ {
1613
j := i * 4
1714

18-
if littleEndian {
19-
dst[i] = binary.LittleEndian.Uint32(b[j:])
20-
} else {
21-
dst[i] = binary.BigEndian.Uint32(b[j:])
22-
}
15+
dst[i] = binary.BigEndian.Uint32(b[j:])
2316
}
2417

2518
return dst
@@ -28,35 +21,21 @@ func keyToUint32s(b []byte) []uint32 {
2821
func bytesToUint32s(inp []byte) [4]uint32 {
2922
var blk [4]uint32
3023

31-
if littleEndian {
32-
blk[0] = binary.LittleEndian.Uint32(inp[0:])
33-
blk[1] = binary.LittleEndian.Uint32(inp[4:])
34-
blk[2] = binary.LittleEndian.Uint32(inp[8:])
35-
blk[3] = binary.LittleEndian.Uint32(inp[12:])
36-
} else {
37-
blk[0] = binary.BigEndian.Uint32(inp[0:])
38-
blk[1] = binary.BigEndian.Uint32(inp[4:])
39-
blk[2] = binary.BigEndian.Uint32(inp[8:])
40-
blk[3] = binary.BigEndian.Uint32(inp[12:])
41-
}
24+
blk[0] = binary.BigEndian.Uint32(inp[0:])
25+
blk[1] = binary.BigEndian.Uint32(inp[4:])
26+
blk[2] = binary.BigEndian.Uint32(inp[8:])
27+
blk[3] = binary.BigEndian.Uint32(inp[12:])
4228

4329
return blk
4430
}
4531

4632
func uint32sToBytes(blk [4]uint32) [16]byte {
4733
var sav [16]byte
4834

49-
if littleEndian {
50-
binary.LittleEndian.PutUint32(sav[0:], blk[0])
51-
binary.LittleEndian.PutUint32(sav[4:], blk[1])
52-
binary.LittleEndian.PutUint32(sav[8:], blk[2])
53-
binary.LittleEndian.PutUint32(sav[12:], blk[3])
54-
} else {
55-
binary.BigEndian.PutUint32(sav[0:], blk[0])
56-
binary.BigEndian.PutUint32(sav[4:], blk[1])
57-
binary.BigEndian.PutUint32(sav[8:], blk[2])
58-
binary.BigEndian.PutUint32(sav[12:], blk[3])
59-
}
35+
binary.BigEndian.PutUint32(sav[0:], blk[0])
36+
binary.BigEndian.PutUint32(sav[4:], blk[1])
37+
binary.BigEndian.PutUint32(sav[8:], blk[2])
38+
binary.BigEndian.PutUint32(sav[12:], blk[3])
6039

6140
return sav
6241
}

‎cipher/cast256/utils.go

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ import (
55
"encoding/binary"
66
)
77

8-
// Endianness option
9-
const littleEndian bool = false
10-
118
func keyToUint32s(b []byte) []uint32 {
129
size := len(b) / 4
1310
dst := make([]uint32, size)
1411

1512
for i := 0; i < size; i++ {
1613
j := i * 4
1714

18-
if littleEndian {
19-
dst[i] = binary.LittleEndian.Uint32(b[j:])
20-
} else {
21-
dst[i] = binary.BigEndian.Uint32(b[j:])
22-
}
15+
dst[i] = binary.BigEndian.Uint32(b[j:])
2316
}
2417

2518
return dst
@@ -28,35 +21,21 @@ func keyToUint32s(b []byte) []uint32 {
2821
func bytesToUint32s(inp []byte) [4]uint32 {
2922
var blk [4]uint32
3023

31-
if littleEndian {
32-
blk[0] = binary.LittleEndian.Uint32(inp[0:])
33-
blk[1] = binary.LittleEndian.Uint32(inp[4:])
34-
blk[2] = binary.LittleEndian.Uint32(inp[8:])
35-
blk[3] = binary.LittleEndian.Uint32(inp[12:])
36-
} else {
37-
blk[0] = binary.BigEndian.Uint32(inp[0:])
38-
blk[1] = binary.BigEndian.Uint32(inp[4:])
39-
blk[2] = binary.BigEndian.Uint32(inp[8:])
40-
blk[3] = binary.BigEndian.Uint32(inp[12:])
41-
}
24+
blk[0] = binary.BigEndian.Uint32(inp[0:])
25+
blk[1] = binary.BigEndian.Uint32(inp[4:])
26+
blk[2] = binary.BigEndian.Uint32(inp[8:])
27+
blk[3] = binary.BigEndian.Uint32(inp[12:])
4228

4329
return blk
4430
}
4531

4632
func uint32sToBytes(blk [4]uint32) [16]byte {
4733
var sav [16]byte
4834

49-
if littleEndian {
50-
binary.LittleEndian.PutUint32(sav[0:], blk[0])
51-
binary.LittleEndian.PutUint32(sav[4:], blk[1])
52-
binary.LittleEndian.PutUint32(sav[8:], blk[2])
53-
binary.LittleEndian.PutUint32(sav[12:], blk[3])
54-
} else {
55-
binary.BigEndian.PutUint32(sav[0:], blk[0])
56-
binary.BigEndian.PutUint32(sav[4:], blk[1])
57-
binary.BigEndian.PutUint32(sav[8:], blk[2])
58-
binary.BigEndian.PutUint32(sav[12:], blk[3])
59-
}
35+
binary.BigEndian.PutUint32(sav[0:], blk[0])
36+
binary.BigEndian.PutUint32(sav[4:], blk[1])
37+
binary.BigEndian.PutUint32(sav[8:], blk[2])
38+
binary.BigEndian.PutUint32(sav[12:], blk[3])
6039

6140
return sav
6241
}

0 commit comments

Comments
 (0)