Code reworked - added two different salt and aes offsets #3331
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There is a typo in the user password printf. You need to replace this line: |
|
Thanks @e-ago. Fixed now. |
magnumripper
approved these changes
Jul 30, 2018
src/bitlocker2john.c
Outdated
| fprintf(stderr, "VMK encrypted with AES-CCM (%lx)\n", (ftell(fp)-2)); | ||
| found_ccm = 1; | ||
| fseek(fp, 3, SEEK_CUR); | ||
| static int rp_search_salt_aes() { |
There was a problem hiding this comment.
Code style - should be
- static int rp_search_salt_aes() {
+ static int rp_search_salt_aes(void)
+ {
src/bitlocker2john.c
Outdated
| int ret=0, x, y; | ||
|
|
||
| for(x=0; x < 2; x++) | ||
| { |
There was a problem hiding this comment.
Code style - should be
- for(x=0; x < 2; x++)
- {
+ for (x = 0; x < 2; x++) {Many more similar cases below.
|
I am going to fix these style issue one last time on @e-ago's behalf. |
The additional AES offset is not enabled until we can't prove that it is correct.
|
Tested with https://github.com/e-ago/bitcracker/blob/master/Images/imgWin10Compat.vhd (password is |
|
@kholia thank you |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The additional AES offset is not enabled until we can't prove that it is correct.
This is essentially #3293 (bitlocker2john code reworked).
I am trusting @e-ago in this PR to do the right thing.