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

fix: parsing wps.Version from wps.WFA

Browse source
This commit is contained in:
evilsocket 2019-01-28 12:34:02 +01:00
commit 4ecd89ae22
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
packets/dot11_wps.go
View file

@ -22,7 +22,7 @@ const (
type wpsAttr struct { type wpsAttr struct {
Name string Name string
Type wpsAttrType Type wpsAttrType
Func func([]byte) string Func func([]byte, *map[string]string) string
Desc map[string]string Desc map[string]string
} }
@ -30,12 +30,13 @@ var (
wpsSignatureBytes = []byte{0x00, 0x50, 0xf2, 0x04} wpsSignatureBytes = []byte{0x00, 0x50, 0xf2, 0x04}
wfaExtensionBytes = []byte{0x00, 0x37, 0x2a} wfaExtensionBytes = []byte{0x00, 0x37, 0x2a}
wpsVersion2ID = uint8(0x00) wpsVersion2ID = uint8(0x00)
wpsVersionDesc = map[string]string{
"10": "1.0",
"11": "1.1",
"20": "2.0",
}
wpsAttributes = map[uint16]wpsAttr{ wpsAttributes = map[uint16]wpsAttr{
0x104A: wpsAttr{Name: "Version", Desc: map[string]string{ 0x104A: wpsAttr{Name: "Version", Desc: wpsVersionDesc},
"10": "1.0",
"11": "1.1",
}},
0x1044: wpsAttr{Name: "State", Desc: map[string]string{ 0x1044: wpsAttr{Name: "State", Desc: map[string]string{
"01": "Not Configured", "01": "Not Configured",
"02": "Configured", "02": "Configured",
@ -85,7 +86,7 @@ var (
} }
) )
func dott11ParseWPSBands(data []byte) string { func dott11ParseWPSBands(data []byte, info *map[string]string) string {
if len(data) == 1 { if len(data) == 1 {
mask := uint8(data[0]) mask := uint8(data[0])
bands := []string{} bands := []string{}
@ -104,7 +105,7 @@ func dott11ParseWPSBands(data []byte) string {
return hex.EncodeToString(data) return hex.EncodeToString(data)
} }
func dot11ParseWPSConfigMethods(data []byte) string { func dot11ParseWPSConfigMethods(data []byte, info *map[string]string) string {
if len(data) == 2 { if len(data) == 2 {
mask := binary.BigEndian.Uint16(data) mask := binary.BigEndian.Uint16(data)
configs := []string{} configs := []string{}
@ -123,14 +124,16 @@ func dot11ParseWPSConfigMethods(data []byte) string {
return hex.EncodeToString(data) return hex.EncodeToString(data)
} }
func dot11ParseWPSVendorExtension(data []byte) string { func dot11ParseWPSVendorExtension(data []byte, info *map[string]string) string {
if len(data) > 3 && bytes.Equal(data[0:3], wfaExtensionBytes) { if len(data) > 3 && bytes.Equal(data[0:3], wfaExtensionBytes) {
size := len(data) size := len(data)
for offset := 3; offset < size; { for offset := 3; offset < size; {
idByte := uint8(data[offset]) idByte := uint8(data[offset])
sizeByte := uint8(data[offset+1]) sizeByte := uint8(data[offset+1])
if idByte == wpsVersion2ID { if idByte == wpsVersion2ID {
return fmt.Sprintf("version2=0x%x", data[offset+2]) verByte := fmt.Sprintf("%x", data[offset+2])
(*info)["Version"] = wpsVersionDesc[verByte]
break
} }
offset += int(sizeByte) + 2 offset += int(sizeByte) + 2
} }
@ -178,7 +181,7 @@ func dot11ParseWPSTag(id uint16, size uint16, data []byte, info *map[string]stri
} }
if attr.Func != nil { if attr.Func != nil {
val = attr.Func(data) val = attr.Func(data, info)
} }
} else { } else {
name = fmt.Sprintf("0x%X", id) name = fmt.Sprintf("0x%X", id)