]> source.dussan.org Git - gitea.git/commitdiff
variable should not use ALL_CAPS
authorGibheer <gibheer+git@zero-knowledge.org>
Tue, 23 Feb 2016 14:39:05 +0000 (15:39 +0100)
committerGibheer <gibheer+git@zero-knowledge.org>
Tue, 23 Feb 2016 14:39:05 +0000 (15:39 +0100)
models/ssh_key.go
models/ssh_key_test.go

index 0e5226076b5e51543b7ff2eca5a3f06ffbe57cf0..c22b931c88da9b8813ae529831767919cd517d21 100644 (file)
@@ -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
        }
index 697c8d46e2c1302b1b9490aba68b349be5486d86..cfb8554ae2c46f46a7082e24a66f78d9991ec4cb 100644 (file)
@@ -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)
                }
        }