Skip to content

fix(ssh2john): correct bcrypt rounds assignment and update exception … #5975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dejanazul wants to merge 1 commit into
base: bleeding-jumbo
Choose a base branch
from
+2 −2
Open

fix(ssh2john): correct bcrypt rounds assignment and update exception … #5975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions run/ssh2john.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def read_private_key(filename):
try:
data = ''.join(lines[start:end]).encode()
data = base64.b64decode(data)
except base64.binascii.Error:
except binascii.Error:
Copy link
Copy Markdown
Member

@solardiz solardiz Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this was maybe a Python 2 vs. 3 modules thing? I think we had this script try to work with either version, as indicated by the shebang not specifying a version.

Copy link
Copy Markdown
Member

@solardiz solardiz Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you actually wrote "in Python 3 environments." So I wonder what this means for Python 2, then? If this script does not support Python 2 anymore (which would be mildly unfortunate), then we need to update the shebang to python3.

e = sys.exc_info()[1]
raise Exception('base64 decoding error: ' + str(e))

Expand Down Expand Up @@ -178,7 +178,7 @@ def read_private_key(filename):
rounds = data[rounds_offset: rounds_offset+4]
rounds = unpack(">I", rounds)[0]
if rounds == 0:
rounds == 16
rounds = 16

keysize = CIPHER_TABLE[encryption_type]['keysize']
salt = binascii.unhexlify(saltstr)
Expand Down