github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 21:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2019-02-21 12:09:18 +01:00
commit ec842d217e
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/hid/keymaps.go
View file

@ -50,7 +50,7 @@ var BaseMap = KeyMap{
} }
var KeyMaps = map[string]KeyMap{ var KeyMaps = map[string]KeyMap{
"BE": KeyMap{ "BE": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 48}, "$": Command{HID: 48},
"(": Command{HID: 34}, "(": Command{HID: 34},
@ -160,7 +160,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"FR": KeyMap{ "FR": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 48}, "$": Command{HID: 48},
"(": Command{HID: 34}, "(": Command{HID: 34},
@ -258,7 +258,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 46, Mode: 64}, "}": Command{HID: 46, Mode: 64},
}, },
"CH": KeyMap{ "CH": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 49}, "$": Command{HID: 49},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -366,7 +366,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 29}, "y": Command{HID: 29},
"}": Command{HID: 49, Mode: 64}, "}": Command{HID: 49, Mode: 64},
}, },
"DK": KeyMap{ "DK": {
"ð": Command{HID: 7, Mode: 64}, "ð": Command{HID: 7, Mode: 64},
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 64}, "$": Command{HID: 33, Mode: 64},
@ -480,7 +480,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"PT": KeyMap{ "PT": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -587,7 +587,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"NO": KeyMap{ "NO": {
"ð": Command{HID: 7, Mode: 64}, "ð": Command{HID: 7, Mode: 64},
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 64}, "$": Command{HID: 33, Mode: 64},
@ -701,7 +701,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"HR": KeyMap{ "HR": {
"-": Command{HID: 56}, "-": Command{HID: 56},
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
@ -825,7 +825,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 29}, "y": Command{HID: 29},
"}": Command{HID: 17, Mode: 64}, "}": Command{HID: 17, Mode: 64},
}, },
"CA": KeyMap{ "CA": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 38, Mode: 2}, "(": Command{HID: 38, Mode: 2},
@ -947,7 +947,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 49, Mode: 64}, "}": Command{HID: 49, Mode: 64},
}, },
"DE": KeyMap{ "DE": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -1058,7 +1058,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 29}, "y": Command{HID: 29},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"TR": KeyMap{ "TR": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 64}, "$": Command{HID: 33, Mode: 64},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -1156,7 +1156,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"IT": KeyMap{ "IT": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -1257,7 +1257,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 48, Mode: 66}, "}": Command{HID: 48, Mode: 66},
}, },
"US": KeyMap{ "US": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 38, Mode: 2}, "(": Command{HID: 38, Mode: 2},
@ -1355,7 +1355,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 48, Mode: 2}, "}": Command{HID: 48, Mode: 2},
}, },
"SV": KeyMap{ "SV": {
"ð": Command{HID: 7, Mode: 64}, "ð": Command{HID: 7, Mode: 64},
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 64}, "$": Command{HID: 33, Mode: 64},
@ -1468,7 +1468,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"SI": KeyMap{ "SI": {
"-": Command{HID: 56}, "-": Command{HID: 56},
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
@ -1592,7 +1592,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 29}, "y": Command{HID: 29},
"}": Command{HID: 17, Mode: 64}, "}": Command{HID: 17, Mode: 64},
}, },
"GB": KeyMap{ "GB": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 38, Mode: 2}, "(": Command{HID: 38, Mode: 2},
@ -1698,7 +1698,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 48, Mode: 2}, "}": Command{HID: 48, Mode: 2},
}, },
"BR": KeyMap{ "BR": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 38, Mode: 2}, "(": Command{HID: 38, Mode: 2},
@ -1800,7 +1800,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 49, Mode: 2}, "}": Command{HID: 49, Mode: 2},
}, },
"RU": KeyMap{ "RU": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 38, Mode: 2}, "(": Command{HID: 38, Mode: 2},
@ -1891,7 +1891,7 @@ var KeyMaps = map[string]KeyMap{
"5": Command{HID: 34}, "5": Command{HID: 34},
"9": Command{HID: 38}, "9": Command{HID: 38},
}, },
"FI": KeyMap{ "FI": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 64}, "$": Command{HID: 33, Mode: 64},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -1997,7 +1997,7 @@ var KeyMaps = map[string]KeyMap{
"y": Command{HID: 28}, "y": Command{HID: 28},
"}": Command{HID: 39, Mode: 64}, "}": Command{HID: 39, Mode: 64},
}, },
"ES": KeyMap{ "ES": {
" ": Command{HID: 44}, " ": Command{HID: 44},
"$": Command{HID: 33, Mode: 2}, "$": Command{HID: 33, Mode: 2},
"(": Command{HID: 37, Mode: 2}, "(": Command{HID: 37, Mode: 2},
@ -2118,7 +2118,7 @@ func KeyMapFor(lang string) KeyMap {
func SupportedLayouts() []string { func SupportedLayouts() []string {
maps := []string{} maps := []string{}
for lang, _ := range KeyMaps { for lang := range KeyMaps {
maps = append(maps, lang) maps = append(maps, lang)
} }
sort.Strings(maps) sort.Strings(maps)

2
network/hid_device.go
View file

@ -111,7 +111,7 @@ func (dev *HIDDevice) ChannelsList() []string {
defer dev.Unlock() defer dev.Unlock()
chans := []string{} chans := []string{}
for ch, _ := range dev.channels { for ch := range dev.channels {
chans = append(chans, fmt.Sprintf("%d", ch)) chans = append(chans, fmt.Sprintf("%d", ch))
} }

2
tls/cert.go
View file

@ -103,7 +103,7 @@ func CreateCertificate(cfg CertConfig) (error, *rsa.PrivateKey, []byte) {
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
BasicConstraintsValid: true, BasicConstraintsValid: true,
IsCA: true, IsCA: true,
} }
cert, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv) cert, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)