dm/psyfer
1
0
Fork 0
Code Issues Pull Requests Activity

corrected naming of fucntions

Browse Source
This commit is contained in:
Derek McQuay 2016-02-22 00:13:19 -08:00
parent 6f4e8b7236
commit 57060e494c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
psyfer/aes.go
View File

@ -416,7 +416,7 @@ func FFmult(cur []byte, multiplier byte) byte {
return 0 return 0
} }
func mixColumns_assist(cur []byte) []byte { func mixColumnsAssist(cur []byte) []byte {
a1 := FFmult(Xtime(cur[0]), MM[0]) ^ FFmult(Xtime(cur[1]), MM[1]) ^ FFmult(Xtime(cur[2]), MM[2]) ^ FFmult(Xtime(cur[3]), MM[3]) a1 := FFmult(Xtime(cur[0]), MM[0]) ^ FFmult(Xtime(cur[1]), MM[1]) ^ FFmult(Xtime(cur[2]), MM[2]) ^ FFmult(Xtime(cur[3]), MM[3])
a2 := FFmult(Xtime(cur[0]), MM[4]) ^ FFmult(Xtime(cur[1]), MM[5]) ^ FFmult(Xtime(cur[2]), MM[6]) ^ FFmult(Xtime(cur[3]), MM[7]) a2 := FFmult(Xtime(cur[0]), MM[4]) ^ FFmult(Xtime(cur[1]), MM[5]) ^ FFmult(Xtime(cur[2]), MM[6]) ^ FFmult(Xtime(cur[3]), MM[7])
a3 := FFmult(Xtime(cur[0]), MM[8]) ^ FFmult(Xtime(cur[1]), MM[9]) ^ FFmult(Xtime(cur[2]), MM[10]) ^ FFmult(Xtime(cur[3]), MM[11]) a3 := FFmult(Xtime(cur[0]), MM[8]) ^ FFmult(Xtime(cur[1]), MM[9]) ^ FFmult(Xtime(cur[2]), MM[10]) ^ FFmult(Xtime(cur[3]), MM[11])
@ -429,10 +429,10 @@ func MixColumns(cur Block) Block {
col2 := []byte{cur[1], cur[5], cur[9], cur[13]} col2 := []byte{cur[1], cur[5], cur[9], cur[13]}
col3 := []byte{cur[2], cur[6], cur[10], cur[14]} col3 := []byte{cur[2], cur[6], cur[10], cur[14]}
col4 := []byte{cur[3], cur[7], cur[11], cur[15]} col4 := []byte{cur[3], cur[7], cur[11], cur[15]}
col1 = mixColumns_assist(col1) col1 = mixColumnsAssist(col1)
col2 = mixColumns_assist(col2) col2 = mixColumnsAssist(col2)
col3 = mixColumns_assist(col3) col3 = mixColumnsAssist(col3)
col4 = mixColumns_assist(col4) col4 = mixColumnsAssist(col4)
cur = Block{ cur = Block{
col1[0], col2[0], col3[0], col4[0], col1[0], col2[0], col3[0], col4[0],
col1[1], col2[1], col3[1], col4[1], col1[1], col2[1], col3[1], col4[1],
@ -447,10 +447,10 @@ func InvMixColumns(cur Block) Block {
col2 := []byte{cur[1], cur[5], cur[9], cur[13]} col2 := []byte{cur[1], cur[5], cur[9], cur[13]}
col3 := []byte{cur[2], cur[6], cur[10], cur[14]} col3 := []byte{cur[2], cur[6], cur[10], cur[14]}
col4 := []byte{cur[3], cur[7], cur[11], cur[15]} col4 := []byte{cur[3], cur[7], cur[11], cur[15]}
col1 = InvmixColumns_assist(col1) col1 = InvMixColumnsAssist(col1)
col2 = InvmixColumns_assist(col2) col2 = InvMixColumnsAssist(col2)
col3 = InvmixColumns_assist(col3) col3 = InvMixColumnsAssist(col3)
col4 = InvmixColumns_assist(col4) col4 = InvMixColumnsAssist(col4)
cur = Block{ cur = Block{
col1[0], col2[0], col3[0], col4[0], col1[0], col2[0], col3[0], col4[0],
col1[1], col2[1], col3[1], col4[1], col1[1], col2[1], col3[1], col4[1],
@ -460,7 +460,7 @@ func InvMixColumns(cur Block) Block {
return cur return cur
} }
func InvmixColumns_assist(cur []byte) []byte { func InvMixColumnsAssist(cur []byte) []byte {
a1 := FFmult(Xtime(cur[0]), iMM[0]) ^ FFmult(Xtime(cur[1]), iMM[1]) ^ FFmult(Xtime(cur[2]), iMM[2]) ^ FFmult(Xtime(cur[3]), iMM[3]) a1 := FFmult(Xtime(cur[0]), iMM[0]) ^ FFmult(Xtime(cur[1]), iMM[1]) ^ FFmult(Xtime(cur[2]), iMM[2]) ^ FFmult(Xtime(cur[3]), iMM[3])
a2 := FFmult(Xtime(cur[0]), iMM[4]) ^ FFmult(Xtime(cur[1]), iMM[5]) ^ FFmult(Xtime(cur[2]), iMM[6]) ^ FFmult(Xtime(cur[3]), iMM[7]) a2 := FFmult(Xtime(cur[0]), iMM[4]) ^ FFmult(Xtime(cur[1]), iMM[5]) ^ FFmult(Xtime(cur[2]), iMM[6]) ^ FFmult(Xtime(cur[3]), iMM[7])
a3 := FFmult(Xtime(cur[0]), iMM[8]) ^ FFmult(Xtime(cur[1]), iMM[9]) ^ FFmult(Xtime(cur[2]), iMM[10]) ^ FFmult(Xtime(cur[3]), iMM[11]) a3 := FFmult(Xtime(cur[0]), iMM[8]) ^ FFmult(Xtime(cur[1]), iMM[9]) ^ FFmult(Xtime(cur[2]), iMM[10]) ^ FFmult(Xtime(cur[3]), iMM[11])

2
psyfer/aes_test.go
View File

@ -116,7 +116,7 @@ func TestMixColumns(t *testing.T) {
0x8e, 0x9f, 0x4d, 0x01, 0x8e, 0x9f, 0x4d, 0x01,
0x4d, 0xdc, 0x7e, 0x01, 0x4d, 0xdc, 0x7e, 0x01,
0xa1, 0x58, 0xbd, 0x01, 0xa1, 0x58, 0xbd, 0x01,
0xbc, 0x9d, 0xf8, 0x02, 0xbc, 0x9d, 0xf8, 0x01,
} }
actual := MixColumns(input) actual := MixColumns(input)
for i := 0; i < 16; i++ { for i := 0; i < 16; i++ {