|
From: Anton A. <an...@us...> - 2005-07-28 15:15:06
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11096 Modified Files: decrypt.c ntfsdecrypt.c Log Message: Fix a core dump. Index: decrypt.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- decrypt.c 28 Jul 2005 11:27:31 -0000 1.18 +++ decrypt.c 28 Jul 2005 15:14:40 -0000 1.19 @@ -145,6 +145,11 @@ static int cryptoAPI_init_imports(void) } #endif /* defined(__CYGWIN__) */ +static void ntfs_desx_key_expand(const u8 *src, u32 *des_key, + u64 *out_whitening, u64 *in_whitening); +static BOOL ntfs_desx_key_expand_test(void); +static BOOL ntfs_des_test(void); + ntfs_decrypt_user_key_session *ntfs_decrypt_user_key_session_open(void) { ntfs_decrypt_user_key_session *session; @@ -172,6 +177,11 @@ ntfs_decrypt_user_key_session *ntfs_decr ((NTFS_DECRYPT_USER_KEY_SESSION*)session)->hSystemStore = hSystemStore; #endif /* defined(__CYGWIN__) */ gcry_control(GCRYCTL_DISABLE_SECMEM, 0); + if (!ntfs_desx_key_expand_test() || !ntfs_des_test()) { + free(session); + errno = EINVAL; + return NULL; + } return session; } @@ -503,11 +513,12 @@ static gcry_cipher_spec_t ntfs_desx_ciph .decrypt = ntfs_desx_decrypt, }; -//#define DO_CRYPTO_TESTS 1 +#define DO_CRYPTO_TESTS 1 #ifdef DO_CRYPTO_TESTS + /* Do not remove this test code from this file! AIA */ -static BOOL desx_key_expand_test(void) +static BOOL ntfs_desx_key_expand_test(void) { const u8 known_desx_on_disk_key[16] = { 0xa1, 0xf9, 0xe0, 0xb2, 0x53, 0x23, 0x9e, 0x8f, @@ -522,14 +533,18 @@ static BOOL desx_key_expand_test(void) const u8 known_in_whitening[8] = { 0x75, 0xf6, 0xa0, 0x1a, 0xc0, 0xca, 0x28, 0x1e }; - u64 test_des_key, test_out_whitening, test_in_whitening; + u64 test_out_whitening, test_in_whitening; + union { + u64 u64; + u32 u32[2]; + } test_des_key; BOOL res; - desx_key_expand(known_desx_on_disk_key, (u32*)test_des_key, - (u64*)test_out_whitening, (u64*)test_in_whitening); - res = test_des_key != *(u64*)known_des_key || - test_out_whitening != *(u64*)known_out_whitening || - test_in_whitening != *(u64*)known_in_whitening; + ntfs_desx_key_expand(known_desx_on_disk_key, test_des_key.u32, + &test_out_whitening, &test_in_whitening); + res = test_des_key.u64 == *(u64*)known_des_key && + test_out_whitening == *(u64*)known_out_whitening && + test_in_whitening == *(u64*)known_in_whitening; fprintf(stderr, "Testing whether ntfs_desx_key_expand() works: %s\n", res ? "SUCCESS" : "FAILED"); return res; @@ -586,12 +601,12 @@ static BOOL ntfs_des_test(void) #else /* !defined(DO_CRYPTO_TESTS) */ -static inline BOOL desx_key_expand_test(void) +static inline BOOL ntfs_desx_key_expand_test(void) { return TRUE; } -static inline BOOL des_test(void) +static inline BOOL ntfs_des_test(void) { return TRUE; } @@ -623,7 +638,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data case CALG_DESX: /* FIXME: This really needs locking so it is safe from races. */ if (!ntfs_desx_module_count++) { - if (!desx_key_expand_test() || !des_test()) { + if (!ntfs_desx_key_expand_test() || !ntfs_des_test()) { errno = EINVAL; return NULL; } @@ -713,10 +728,12 @@ unsigned ntfs_decrypt_data_key_decrypt_s err = gcry_cipher_reset(dkey->gcry_cipher_hd); if (err != GPG_ERR_NO_ERROR) fprintf(stderr, "Failed to reset cipher (error 0x%x).\n", err); - // FIXME: Why are we not calling gcry_cipher_setiv() here instead of - // doing it by hand after the decryption? - // It wants iv length 8 but we give it 16 for AES256 so it does not - // like it... + /* + * Note: You may wonder why are we not calling gcry_cipher_setiv() here + * instead of doing it by hand after the decryption. The answer is + * that gcry_cipher_setiv() wants an iv of length 8 bytes but we give + * it a length of 16 for AES256 so it does not like it. + */ if ((err = gcry_cipher_decrypt(dkey->gcry_cipher_hd, data, 512, NULL, 0))) fprintf(stderr, "Decryption failed (error 0x%x).\n", err); Index: ntfsdecrypt.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ntfsdecrypt.c 28 Jul 2005 10:36:32 -0000 1.7 +++ ntfsdecrypt.c 28 Jul 2005 15:14:55 -0000 1.8 @@ -274,30 +274,30 @@ static int cat_decrypt(ntfs_inode *inode static ntfs_decrypt_data_key *get_fek_from_df_array( ntfs_decrypt_user_key_session *session, - EFS_DF_ARRAY_HEADER *efs_df_array) + EFS_DF_ARRAY_HEADER *df_array) { - u32 ddf_count, hash_size, fek_size; - EFS_DF_CREDENTIAL_HEADER *efs_df_cred; - EFS_DF_CERTIFICATE_HEADER *efs_df_cert; - EFS_DF_HEADER *efs_df_header; + u32 df_count, hash_size, fek_size; + EFS_DF_CREDENTIAL_HEADER *df_cred; + EFS_DF_CERTIFICATE_HEADER *df_cert; + EFS_DF_HEADER *df_header; ntfs_decrypt_user_key *key; u8 *hash_data, *fek_buf; unsigned i; - efs_df_header = (EFS_DF_HEADER*)(efs_df_array + 1); - ddf_count = le32_to_cpu(efs_df_array->df_count); - for (i = 0; i < ddf_count; i++) { - //Eprintf("ddf #%u.\n", i); - efs_df_cred = (EFS_DF_CREDENTIAL_HEADER*)((u8*)efs_df_header + - le32_to_cpu(efs_df_header->cred_header_offset)); - efs_df_cert = (EFS_DF_CERTIFICATE_HEADER*)((u8*)efs_df_cred + - le32_to_cpu(efs_df_cred->cert_header_offset)); - hash_size = le32_to_cpu(efs_df_cert->thumbprint_size); - hash_data = (u8*)efs_df_cert + - le32_to_cpu(efs_df_cert->thumbprint_offset); - fek_size = le32_to_cpu(efs_df_header->fek_size); - fek_buf = (u8*)efs_df_header + - le32_to_cpu(efs_df_header->fek_offset); + df_header = (EFS_DF_HEADER*)(df_array + 1); + df_count = le32_to_cpu(df_array->df_count); + //Eprintf("df_count 0x%x\n", df_count); + for (i = 0; i < df_count; i++) { + //Eprintf("ddf 0x%x\n", i); + df_cred = (EFS_DF_CREDENTIAL_HEADER*)((u8*)df_header + + le32_to_cpu(df_header->cred_header_offset)); + df_cert = (EFS_DF_CERTIFICATE_HEADER*)((u8*)df_cred + + le32_to_cpu(df_cred->cert_header_offset)); + hash_size = le32_to_cpu(df_cert->thumbprint_size); + hash_data = (u8*)df_cert + + le32_to_cpu(df_cert->thumbprint_offset); + fek_size = le32_to_cpu(df_header->fek_size); + fek_buf = (u8*)df_header + le32_to_cpu(df_header->fek_offset); if ((key = ntfs_decrypt_user_key_open(session, hash_data, hash_size))) { fek_size = ntfs_decrypt_user_key_decrypt(key, fek_buf, @@ -309,8 +309,8 @@ static ntfs_decrypt_data_key *get_fek_fr fprintf(stderr, "Failed to decrypt the FEK.\n"); } else perror("Failed to open user key"); - efs_df_header = (EFS_DF_HEADER*)((u8*)efs_df_header + - le32_to_cpu(efs_df_header->df_length)); + df_header = (EFS_DF_HEADER*)((u8*)df_header + + le32_to_cpu(df_header->df_length)); } return NULL; } @@ -357,10 +357,13 @@ static ntfs_decrypt_data_key *get_fek(nt } /* Iterate through the DDFs & DRFs until we obtain a key. */ efs_attr = (EFS_ATTR_HEADER*)efs_buffer; - efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer + + fek = NULL; + if (efs_attr->offset_to_ddf_array) { + efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer + le32_to_cpu(efs_attr->offset_to_ddf_array)); - fek = get_fek_from_df_array(session, efs_df_array); - if (!fek) { + fek = get_fek_from_df_array(session, efs_df_array); + } + if (!fek && efs_attr->offset_to_drf_array) { efs_df_array = (EFS_DF_ARRAY_HEADER*)(efs_buffer + le32_to_cpu(efs_attr->offset_to_drf_array)); fek = get_fek_from_df_array(session, efs_df_array); |
