summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGibheer <gibheer+git@zero-knowledge.org>2016-02-23 15:39:05 +0100
committerGibheer <gibheer+git@zero-knowledge.org>2016-02-23 15:39:05 +0100
commit2f27ee2232ca23404baf31443a3cf661d4445232 (patch)
tree47ef17da93d86e8db5fa8081aaa603b277db56fd
parentdab74f21b7b7f9755a8056d17adbd74c185c4199 (diff)
downloadgitea-2f27ee2232ca23404baf31443a3cf661d4445232.tar.gz
gitea-2f27ee2232ca23404baf31443a3cf661d4445232.zip
variable should not use ALL_CAPS
-rw-r--r--models/ssh_key.go8
-rw-r--r--models/ssh_key_test.go6
2 files changed, 7 insertions, 7 deletions
diff --git a/models/ssh_key.go b/models/ssh_key.go
index 0e5226076b..c22b931c88 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -36,8 +36,8 @@ const (
)
var (
- sshOpLocker = sync.Mutex{}
- SSH_UNKNOWN_KEY_TYPE = fmt.Errorf("unknown key type")
+ sshOpLocker = sync.Mutex{}
+ SSHUnknownKeyType = fmt.Errorf("unknown key type")
)
type KeyType int
@@ -186,7 +186,7 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {
return "", 0, fmt.Errorf("public key check failed with error '%s': %s", err, stderr)
}
if strings.HasSuffix(stdout, "is not a public key file.") {
- return "", 0, SSH_UNKNOWN_KEY_TYPE
+ return "", 0, SSHUnknownKeyType
}
fields := strings.Split(stdout, " ")
if len(fields) < 4 {
@@ -216,7 +216,7 @@ func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
pkey, err := ssh.ParsePublicKey(raw)
if err != nil {
if strings.HasPrefix(err.Error(), "ssh: unknown key algorithm") {
- return "", 0, SSH_UNKNOWN_KEY_TYPE
+ return "", 0, SSHUnknownKeyType
}
return "", 0, err
}
diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go
index 697c8d46e2..cfb8554ae2 100644
--- a/models/ssh_key_test.go
+++ b/models/ssh_key_test.go
@@ -21,7 +21,7 @@ func TestSSHKeyVerification(t *testing.T) {
for name, pubkey := range keys {
keyTypeN, lengthN, errN := SSHNativeParsePublicKey(pubkey)
if errN != nil {
- if errN != SSH_UNKNOWN_KEY_TYPE {
+ if errN != SSHUnknownKeyType {
t.Errorf("error parsing public key '%s': %s", name, errN)
continue
}
@@ -31,8 +31,8 @@ func TestSSHKeyVerification(t *testing.T) {
t.Errorf("error parsing public key '%s': %s", name, errK)
continue
}
- // we know that ed25519 is currently not supported by native and returns SSH_UNKNOWN_KEY_TYPE
- if (keyTypeN != keyTypeK || lengthN != lengthK) && errN != SSH_UNKNOWN_KEY_TYPE {
+ // we know that ed25519 is currently not supported by native and returns SSHUnknownKeyType
+ if (keyTypeN != keyTypeK || lengthN != lengthK) && errN != SSHUnknownKeyType {
t.Errorf("key mismatch for '%s': native: %s(%d), ssh-keygen: %s(%d)", name, keyTypeN, lengthN, keyTypeK, lengthK)
}
}