diff --git a/go.mod b/go.mod index f74d6b70..e507c913 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.11 require ( shylinux.com/x/go-qrcode v0.0.1 - shylinux.com/x/toolkits v0.5.5 + shylinux.com/x/toolkits v0.5.6 shylinux.com/x/websocket v0.0.1 ) diff --git a/go.sum b/go.sum index 1f9f2c81..4d0d1da8 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= -shylinux.com/x/toolkits v0.5.5 h1:zbUu6jcfX6xUjzJ479VHC+zLKaSzHHjU4suICeqRCaQ= -shylinux.com/x/toolkits v0.5.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/toolkits v0.5.6 h1:iSwkPBbRaqfPfeNePpVafjbQdVkdR2nY9FXMCxrwwfw= +shylinux.com/x/toolkits v0.5.6/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= diff --git a/misc/ssh/rsa.go b/misc/ssh/rsa.go index 840e4d47..547fc3bc 100644 --- a/misc/ssh/rsa.go +++ b/misc/ssh/rsa.go @@ -8,6 +8,7 @@ import ( "golang.org/x/crypto/ssh" ice "shylinux.com/x/icebergs" + "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/mdb" kit "shylinux.com/x/toolkits" ) @@ -19,7 +20,7 @@ const ( const RSA = "rsa" func init() { - Index.Merge(&ice.Context{Configs: map[string]*ice.Config{ + aaa.Index.Merge(&ice.Context{Configs: map[string]*ice.Config{ RSA: {Name: RSA, Help: "角色", Value: kit.Data(mdb.SHORT, mdb.HASH, mdb.FIELD, "time,hash,public,private")}, }, Commands: map[string]*ice.Command{ RSA: {Name: "rsa hash auto create import", Help: "公钥", Action: ice.MergeAction(map[string]*ice.Action{ diff --git a/misc/ssh/service.go b/misc/ssh/service.go index 80d3c10a..4321bcf1 100644 --- a/misc/ssh/service.go +++ b/misc/ssh/service.go @@ -92,7 +92,6 @@ func _ssh_accept(m *ice.Message, h string, c net.Conn) { const ( WELCOME = "welcome" GOODBYE = "goodbye" - PRIVATE = "private" AUTHKEY = "authkey" REQUEST = "request" )