shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

see firmware version from solotool

Browse Source
This commit is contained in:
Conor Patrick 2019-02-12 15:11:48 -05:00
parent ba4f9ed7ae
commit 72bca0765a
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/solotool.py
View File

@ -103,6 +103,9 @@ def get_firmware_object(sk_name, hex_file):
msg = {'firmware': fw, 'signature': sig} msg = {'firmware': fw, 'signature': sig}
return msg return msg
class SoloExtension:
version= 0x14
rng = 0x15
class SoloBootloader: class SoloBootloader:
write = 0x40 write = 0x40
@ -209,10 +212,16 @@ class SoloClient:
return res.signature[1:] return res.signature[1:]
def version(self,): def bootloader_version(self,):
data = self.exchange(SoloBootloader.version) data = self.exchange(SoloBootloader.version)
if len(data) > 1:
return (data[0],data[1])
return data[0] return data[0]
def solo_version(self,):
data = self.exchange_u2f(SoloExtension.version)
return (data[0],data[1])
def write_flash(self, addr, data): def write_flash(self, addr, data):
self.exchange(SoloBootloader.write, addr, data) self.exchange(SoloBootloader.write, addr, data)
@ -269,7 +278,7 @@ class SoloClient:
def is_solo_bootloader(self,): def is_solo_bootloader(self,):
try: try:
self.version() self.bootloader_version()
return True return True
except CtapError as e: except CtapError as e:
if e.code == CtapError.ERR.INVALID_COMMAND: if e.code == CtapError.ERR.INVALID_COMMAND:
@ -596,7 +605,7 @@ def solo_main():
) )
parser.add_argument("--wink", action="store_true", help='HID Wink command.') parser.add_argument("--wink", action="store_true", help='HID Wink command.')
parser.add_argument("--reset", action="store_true", help='Issue a FIDO2 reset command. Warning: your credentials will be lost.') parser.add_argument("--reset", action="store_true", help='Issue a FIDO2 reset command. Warning: your credentials will be lost.')
parser.add_argument("--verify-solo", action="store_true", help='Verify that the Solo firmware is from SoloKeys.') parser.add_argument("--verify-solo", action="store_true", help='Verify that the Solo firmware is from SoloKeys. Check firmware version.')
args = parser.parse_args() args = parser.parse_args()
p = SoloClient() p = SoloClient()
@ -617,12 +626,22 @@ def solo_main():
if args.verify_solo: if args.verify_solo:
cert = p.make_credential() cert = p.make_credential()
solo_fingerprint = b'r\xd5\x831&\xac\xfc\xe9\xa8\xe8&`\x18\xe6AI4\xc8\xbeJ\xb8h_\x91\xb0\x99!\x13\xbb\xd42\x95' solo_fingerprint = b'r\xd5\x831&\xac\xfc\xe9\xa8\xe8&`\x18\xe6AI4\xc8\xbeJ\xb8h_\x91\xb0\x99!\x13\xbb\xd42\x95'
hacker_fingerprint = b"\xd0ml\xcb\xda}\xe5j\x16'\xc2\xa7\x89\x9c5\xa2\xa3\x16\xc8Q\xb3j\xd8\xed~\xd7\x84y\xbbx~\xf7"
if (cert.fingerprint(hashes.SHA256()) == solo_fingerprint): if (cert.fingerprint(hashes.SHA256()) == solo_fingerprint):
print('Valid firmware from SoloKeys') print('Valid SOLO firmware from SoloKeys')
elif (cert.fingerprint(hashes.SHA256()) == hacker_fingerprint):
print('Valid HACKER firmware')
else: else:
print('This is either a Solo Hacker or a invalid Solo.') print('Unknown fingerprint! ', cert.fingerprint(hashes.SHA256()))
try:
v = p.solo_version()
print('Version: ', v)
except ApduError:
print('Firmware is out of date.')
def asked_for_help(): def asked_for_help():
@ -922,7 +941,7 @@ def programmer_main():
sys.exit(1) sys.exit(1)
try: try:
p.version() p.bootloader_version()
except CtapError as e: except CtapError as e:
if e.code == CtapError.ERR.INVALID_COMMAND: if e.code == CtapError.ERR.INVALID_COMMAND:
print('Bootloader not active. Attempting to boot into bootloader mode...') print('Bootloader not active. Attempting to boot into bootloader mode...')