address some code review feedback

golang · Apr 11, 2018 · f960e99 · f960e99
1 parent 9eb8467
commit f960e99
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/crypto/aes/cipher_s390x.go b/src/crypto/aes/cipher_s390x.go
@@ -31,7 +31,7 @@ type aesCipherAsm struct {
 func cryptBlocks(c code, key, dst, src *byte, length int)
 
 func newCipher(key []byte) (cipher.Block, error) {
-	if !(cpu.S390X.HasKM && cpu.S390X.HasKMC && cpu.S390X.HasKMCTR && cpu.S390x.HasKIMD) {
+	if !(cpu.S390X.HasKM && cpu.S390X.HasKMC && cpu.S390X.HasKMCTR && cpu.S390X.HasKIMD) {
 		return newCipherGeneric(key)
 	}
 

diff --git a/src/crypto/tls/gcm_s390x.go b/src/crypto/tls/gcm_s390x.go
@@ -8,5 +8,5 @@ import (
 	"internal/cpu"
 )
 
-var hasGCMAsm = cpu.S390X.HasKMA || (cpu.S390X.HasKM && cpu.S390X.HasKMC && cpu.S390X.HasKMCTR && cpu.S390x.HasKIMD)
+var hasGCMAsm = cpu.S390X.HasKM && ( cpu.S390X.HasKMA || (cpu.S390X.HasKMC && cpu.S390X.HasKMCTR && cpu.S390X.HasKIMD) )
 
diff --git a/src/internal/cpu/cpu_s390x.go b/src/internal/cpu/cpu_s390x.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build s390x
-
 package cpu
 
 const CacheLineSize = 256

diff --git a/src/internal/cpu/cpu_s390x.s b/src/internal/cpu/cpu_s390x.s
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build s390x
-
 #include "textflag.h"
 
 // func hasKM() bool
 TEXT ·hasKM(SB),NOSPLIT,$16-1
-    XOR	R0, R0          // set function code to 0 (query)
+ 	XOR	R0, R0          // set function code to 0 (query)
 	LA	mask-16(SP), R1 // 16-byte stack variable for mask
 	MOVD	$(0x38<<40), R3 // mask for bits 18-20 (big endian)
 
@@ -26,11 +24,11 @@ notfound:
 
 // func hasKMC() bool
 TEXT ·hasKMC(SB),NOSPLIT,$16-1
-    XOR	R0, R0          // set function code to 0 (query)
+ 	XOR	R0, R0          // set function code to 0 (query)
 	LA	mask-16(SP), R1 // 16-byte stack variable for mask
 	MOVD	$(0x38<<40), R3 // mask for bits 18-20 (big endian)
 
-    // check for KMC AES functions
+	// check for KMC AES functions
 	WORD	$0xB92F0024 // cipher message with chaining (KMC)
 	MOVD	mask-16(SP), R2
 	AND	R3, R2
@@ -44,7 +42,7 @@ notfound:
 
 // func hasKMCTR() bool
 TEXT ·hasKMCTR(SB),NOSPLIT,$16-1
-    XOR	R0, R0          // set function code to 0 (query)
+	XOR	R0, R0          // set function code to 0 (query)
 	LA	mask-16(SP), R1 // 16-byte stack variable for mask
 	MOVD	$(0x38<<40), R3 // mask for bits 18-20 (big endian)
 
@@ -85,7 +83,7 @@ yes:
 
 // func hasKIMD() bool
 TEXT ·hasKIMD(SB),NOSPLIT,$16-1
-    XOR	R0, R0          // set function code to 0 (query)
+	XOR	R0, R0          // set function code to 0 (query)
 	LA	mask-16(SP), R1 // 16-byte stack variable for mask
 	MOVD	$(0x38<<40), R3 // mask for bits 18-20 (big endian)