Skip to content

Conversation

@magnumripper
Copy link
Member

@magnumripper magnumripper commented Nov 22, 2025

Bare XSHA is exactly 48 chars of uppercase hex. Pot entries will currently be iterated-sha1 canonical, tagged and in lowercase.

I guess we should write XSHA entries to .pot using the raw uppercase format, like the XSHA-specific CPU format does? This will complicate valid a little and need adding a split() but it's trivial. Working on it (slowly).

@magnumripper magnumripper marked this pull request as draft November 22, 2025 00:31
@magnumripper
Copy link
Member Author

I guess we should write XSHA entries to .pot using the raw uppercase format, like the XSHA-specific CPU format does? This will complicate valid a little and need adding a split() but it's trivial. Working on it (slowly).

Done. Actually no split() needed as we require uppercase for XSHA and lowercase for others. I could even drop prepare().

@magnumripper magnumripper marked this pull request as ready for review November 27, 2025 11:04
Copy link
Member

@solardiz solardiz left a comment

Choose a reason for hiding this comment

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

I agree with the changes here.

However, I think our checks for the format tag should be case-sensitive. I now see we also have similar case-insensitive matching of tags in a few other formats - those are probably also wrong in doing that - but let's at least not make matters worse by replicating this in new formats without a reason.

@magnumripper
Copy link
Member Author

However, I think our checks for the format tag should be case-sensitive. I now see we also have similar case-insensitive matching of tags in a few other formats

Wow, I never noticed. I'll fix this one but we should probably fix all other formats (giving each some thought - there might be some where it's sensible although I can't think of any).

Bare XSHA need to 48 chars of uppercase hex. These will end up in
john.pot as-is (like the old XSHA format).
@magnumripper magnumripper merged commit 3e1b437 into openwall:bleeding-jumbo Dec 6, 2025
33 of 34 checks passed
@magnumripper magnumripper deleted the isha1-prepare branch December 6, 2025 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants