opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ntfsdecrypt to also work with passwordless files. Note this 

requires a patched gnutls library or it still does not work.  (Anton)
edge.strict_endians
antona 2005-08-10 10:17:03 +00:00
parent 8ffbca582f
commit c9d112e9ea
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@ xx/xx/2005 - 1.11.3-WIP
- Put in a minimum version for libgcrypt of 1.2.0 as I do not know if
our code works with earlier versions. (Anton)
- Fix some memory leaks in ntfsdecrypt and do some cleanups. (Anton)
- Fix ntfsdecrypt to also work with passwordless files. Note this
requires a patched gnutls library or it still does not work. (Anton)
08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.

13
ntfsprogs/ntfsdecrypt.c
View File

@ -428,12 +428,21 @@ static ntfs_rsa_private_key ntfs_pkcs12_extract_rsa_key(u8 *pfx, int pfx_size,
}
/*
* Verify that the password is correct and that the key file has not
* been tampered with.
* been tampered with. Note if the password has zero length and the
* verification fails, retry with password set to NULL. This is needed
* to get passwordless .pfx files generated with Windows XP SP1 (and
* probably earlier versions of Windows) to work.
*/
retry_verify:
err = gnutls_pkcs12_verify_mac(pkcs12, password);
if (err) {
fprintf(stderr, "Failed to verify the MAC (%s). Is the "
"password correct?\n", gnutls_strerror(err));
if (err == GNUTLS_E_MAC_VERIFY_FAILED &&
password && !strlen(password)) {
password = NULL;
goto retry_verify;
}
goto out;
}
for (bag_index = 0; ; bag_index++) {
@ -485,8 +494,6 @@ check_again:
goto bag_out;
}
/* Decrypt the private key into GNU TLS format. */
// FIXME: Due to bugs (?) in gnutls this fails when an
// empty password is used.
err = gnutls_x509_privkey_import_pkcs8(pkey, &dkey,
GNUTLS_X509_FMT_DER, password, flags);
if (err) {