Cleaning up imports, fixing a few bugs.

This commit is contained in:
derv82
2018-03-17 04:32:00 -04:00
parent f4a11f9acb
commit 7b9a023bd6
12 changed files with 48 additions and 37 deletions

View File

@@ -1,7 +1,7 @@
#!/usr/bin/python2.7
# -*- coding: utf-8 -*-
from wifite.util.color import Color
from ..util.color import Color
import re
@@ -78,9 +78,8 @@ class Interface(object):
@staticmethod
def get_mac(iface=None):
from Configuration import Configuration
from Process import Process
import re
from ..config import Configuration
from ..util.process import Process
if iface is None:
Configuration.initialize()

View File

@@ -50,20 +50,20 @@ class CrackResult(object):
def load(json):
''' Returns an instance of the appropriate object given a json instance '''
if json['type'] == 'WPA':
from CrackResultWPA import CrackResultWPA
from .wpa_result import CrackResultWPA
result = CrackResultWPA(json['bssid'],
json['essid'],
json['handshake_file'],
json['key'])
elif json['type'] == 'WEP':
from CrackResultWEP import CrackResultWEP
from .wep_result import CrackResultWEP
result = CrackResultWEP(json['bssid'],
json['essid'],
json['hex_key'],
json['ascii_key'])
elif json['type'] == 'WPS':
from CrackResultWPS import CrackResultWPS
from .wps_result import CrackResultWPS
result = CrackResultWPS(json['bssid'],
json['essid'],
json['pin'],

View File

@@ -1,7 +1,7 @@
#!/usr/bin/python2.7
# -*- coding: utf-8 -*-
from wifite.util.color import Color
from ..util.color import Color
import re