Mercurial > libpst
changeset 79:56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Fix the order of testing item types to avoid claiming there are multiple message stores.
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Fri, 13 Jun 2008 20:47:01 -0700 |
| parents | 535075b4d261 |
| children | 4a760802ef29 |
| files | ChangeLog NEWS libpst.spec.in regression/regression-tests.bash src/debug.c src/getidblock.c src/libpst.c src/libpst.h src/lzfu.c src/pst2dii.cpp.in src/pst2ldif.cpp src/readpst.c xml/libpst.in |
| diffstat | 13 files changed, 247 insertions(+), 291 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 10 14:28:55 2008 -0700 +++ b/ChangeLog Fri Jun 13 20:47:01 2008 -0700 @@ -1,3 +1,9 @@ +LibPST 0.6.13 (2008-06-13) +=============================== + * Patch from Robert Simpson for encryption type 2. + * Fix the order of testing item types to avoid claiming + there are multiple message stores. + LibPST 0.6.12 (2008-06-10) =============================== * Patch from Joachim Metz for debian packaging, and fix
--- a/NEWS Tue Jun 10 14:28:55 2008 -0700 +++ b/NEWS Fri Jun 13 20:47:01 2008 -0700 @@ -1,3 +1,4 @@ +0.6.13 2008-06-13 Patch from Robert Simpson for encryption type 2. 0.6.12 2008-06-10 Patch from Joachim Metz for debian packaging, and fix for incorrect length on lz decompression. 0.6.11 2008-06-03 Use ftello/fseeko to properly handle large files. 0.6.10 2008-05-29 Patch from Robert Simpson for doubly-linked list and arrays of unicode strings.
--- a/libpst.spec.in Tue Jun 10 14:28:55 2008 -0700 +++ b/libpst.spec.in Fri Jun 13 20:47:01 2008 -0700 @@ -47,6 +47,9 @@ %changelog +* Fri Jun 13 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.13-1 +- Patch from Robert Simpson for encryption type 2. + * Tue Jun 10 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.12-1 - Patch from Joachim Metz for debian packaging and - fix for incorrect length on lz decompression
--- a/regression/regression-tests.bash Tue Jun 10 14:28:55 2008 -0700 +++ b/regression/regression-tests.bash Fri Jun 13 20:47:01 2008 -0700 @@ -3,7 +3,7 @@ val="valgrind --leak-check=full" val='' -for i in {1..10}; do +for i in {1..12}; do rm -rf output$i mkdir output$i done @@ -47,7 +47,13 @@ $val ../src/readpst -cv -o output10 -d dumper Single2003-unread.pst >out10.err 2>&1 ../src/readpstlog -f I dumper >Single2003-unread.log -$val ../src/lspst -d dumper ams.pst >out11.err 2>&1 +$val ../src/readpst -cv -o output11 -d dumper ol2k3high.pst >out11.err 2>&1 + ../src/readpstlog -f I dumper >ol2k3high.log + +$val ../src/readpst -cv -o output12 -d dumper ol97high.pst >out12.err 2>&1 + ../src/readpstlog -f I dumper >ol97high.log + +$val ../src/lspst -d dumper ams.pst >out13.err 2>&1 ../src/readpstlog -f I dumper >ams.log rm -f dumper
--- a/src/debug.c Tue Jun 10 14:28:55 2008 -0700 +++ b/src/debug.c Fri Jun 13 20:47:01 2008 -0700 @@ -125,7 +125,9 @@ va_list ap; int f, g; char x[2]; - char *buf = NULL; + #ifdef _WIN32 + char *buf = NULL; + #endif struct pst_debug_item *temp; if (!debug_fp) return; // no file // get the record off of the temp_list
--- a/src/getidblock.c Tue Jun 10 14:28:55 2008 -0700 +++ b/src/getidblock.c Fri Jun 13 20:47:01 2008 -0700 @@ -9,7 +9,7 @@ // pass the id number to display on the command line char *fname, *sid; pst_file pstfile; - unsigned int id; + uint64_t id; int decrypt = 0, process = 0, binary = 0, c; char *buf = NULL; size_t readSize; @@ -46,8 +46,8 @@ exit(EXIT_FAILURE); } fname = argv[optind]; - sid = argv[optind + 1]; - id = (unsigned int) strtol(sid, NULL, 0); + sid = argv[optind + 1]; + id = (uint64_t)strtoll(sid, NULL, 0); DEBUG_MAIN(("Opening file\n")); memset(&pstfile, 0, sizeof(pstfile)); @@ -73,7 +73,7 @@ printf("Block %#x, size %#x[%i]\n", id, (unsigned int) readSize, (int) readSize); if (decrypt != 0) - if (pst_decrypt(buf, readSize, (int) pstfile.encryption) != 0) { + if (pst_decrypt(id, buf, readSize, (int) pstfile.encryption) != 0) { DIE(("Error decrypting block\n")); }
--- a/src/libpst.c Tue Jun 10 14:28:55 2008 -0700 +++ b/src/libpst.c Fri Jun 13 20:47:01 2008 -0700 @@ -94,44 +94,66 @@ } pst_block_hdr; +// for "compressible" encryption, just a simple substitution cipher // this is an array of the un-encrypted values. the un-encrypted value is in the position // of the encrypted value. ie the encrypted value 0x13 represents 0x02 -// 0 1 2 3 4 5 6 7 -// 8 9 a b c d e f -static unsigned char comp_enc [] = - { 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48, - 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, /*0x0f*/ - 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab, - 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, /*0x1f*/ - 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82, - 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, /*0x2f*/ - 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4, - 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, /*0x3f*/ - 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a, - 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, /*0x4f*/ - 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76, - 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, /*0x5f*/ - 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf, - 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, /*0x6f*/ - 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66, - 0x75, 0xac, 0xb1, 0xe9, 0x45, 0x21, 0x70, 0x0c, /*0x7f*/ - 0x87, 0x9f, 0x74, 0xa4, 0x22, 0x4c, 0x6f, 0xbf, - 0x1f, 0x56, 0xaa, 0x2e, 0xb3, 0x78, 0x33, 0x50, /*0x8f*/ - 0xb0, 0xa3, 0x92, 0xbc, 0xcf, 0x19, 0x1c, 0xa7, - 0x63, 0xcb, 0x1e, 0x4d, 0x3e, 0x4b, 0x1b, 0x9b, /*0x9f*/ - 0x4f, 0xe7, 0xf0, 0xee, 0xad, 0x3a, 0xb5, 0x59, - 0x04, 0xea, 0x40, 0x55, 0x25, 0x51, 0xe5, 0x7a, /*0xaf*/ - 0x89, 0x38, 0x68, 0x52, 0x7b, 0xfc, 0x27, 0xae, - 0xd7, 0xbd, 0xfa, 0x07, 0xf4, 0xcc, 0x8e, 0x5f, /*0xbf*/ - 0xef, 0x35, 0x9c, 0x84, 0x2b, 0x15, 0xd5, 0x77, - 0x34, 0x49, 0xb6, 0x12, 0x0a, 0x7f, 0x71, 0x88, /*0xcf*/ - 0xfd, 0x9d, 0x18, 0x41, 0x7d, 0x93, 0xd8, 0x58, - 0x2c, 0xce, 0xfe, 0x24, 0xaf, 0xde, 0xb8, 0x36, /*0xdf*/ - 0xc8, 0xa1, 0x80, 0xa6, 0x99, 0x98, 0xa8, 0x2f, - 0x0e, 0x81, 0x65, 0x73, 0xe4, 0xc2, 0xa2, 0x8a, /*0xef*/ - 0xd4, 0xe1, 0x11, 0xd0, 0x08, 0x8b, 0x2a, 0xf2, - 0xed, 0x9a, 0x64, 0x3f, 0xc1, 0x6c, 0xf9, 0xec}; /*0xff*/ - +static unsigned char comp_enc [] = { + 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48, 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, + 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab, 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, + 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82, 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, + 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4, 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, + 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a, 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, + 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76, 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, + 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf, 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, + 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66, 0x75, 0xac, 0xb1, 0xe9, 0x45, 0x21, 0x70, 0x0c, + 0x87, 0x9f, 0x74, 0xa4, 0x22, 0x4c, 0x6f, 0xbf, 0x1f, 0x56, 0xaa, 0x2e, 0xb3, 0x78, 0x33, 0x50, + 0xb0, 0xa3, 0x92, 0xbc, 0xcf, 0x19, 0x1c, 0xa7, 0x63, 0xcb, 0x1e, 0x4d, 0x3e, 0x4b, 0x1b, 0x9b, + 0x4f, 0xe7, 0xf0, 0xee, 0xad, 0x3a, 0xb5, 0x59, 0x04, 0xea, 0x40, 0x55, 0x25, 0x51, 0xe5, 0x7a, + 0x89, 0x38, 0x68, 0x52, 0x7b, 0xfc, 0x27, 0xae, 0xd7, 0xbd, 0xfa, 0x07, 0xf4, 0xcc, 0x8e, 0x5f, + 0xef, 0x35, 0x9c, 0x84, 0x2b, 0x15, 0xd5, 0x77, 0x34, 0x49, 0xb6, 0x12, 0x0a, 0x7f, 0x71, 0x88, + 0xfd, 0x9d, 0x18, 0x41, 0x7d, 0x93, 0xd8, 0x58, 0x2c, 0xce, 0xfe, 0x24, 0xaf, 0xde, 0xb8, 0x36, + 0xc8, 0xa1, 0x80, 0xa6, 0x99, 0x98, 0xa8, 0x2f, 0x0e, 0x81, 0x65, 0x73, 0xe4, 0xc2, 0xa2, 0x8a, + 0xd4, 0xe1, 0x11, 0xd0, 0x08, 0x8b, 0x2a, 0xf2, 0xed, 0x9a, 0x64, 0x3f, 0xc1, 0x6c, 0xf9, 0xec +}; + +// for "strong" encryption, we have the two additional tables +static unsigned char comp_high1 [] = { + 0x41, 0x36, 0x13, 0x62, 0xa8, 0x21, 0x6e, 0xbb, 0xf4, 0x16, 0xcc, 0x04, 0x7f, 0x64, 0xe8, 0x5d, + 0x1e, 0xf2, 0xcb, 0x2a, 0x74, 0xc5, 0x5e, 0x35, 0xd2, 0x95, 0x47, 0x9e, 0x96, 0x2d, 0x9a, 0x88, + 0x4c, 0x7d, 0x84, 0x3f, 0xdb, 0xac, 0x31, 0xb6, 0x48, 0x5f, 0xf6, 0xc4, 0xd8, 0x39, 0x8b, 0xe7, + 0x23, 0x3b, 0x38, 0x8e, 0xc8, 0xc1, 0xdf, 0x25, 0xb1, 0x20, 0xa5, 0x46, 0x60, 0x4e, 0x9c, 0xfb, + 0xaa, 0xd3, 0x56, 0x51, 0x45, 0x7c, 0x55, 0x00, 0x07, 0xc9, 0x2b, 0x9d, 0x85, 0x9b, 0x09, 0xa0, + 0x8f, 0xad, 0xb3, 0x0f, 0x63, 0xab, 0x89, 0x4b, 0xd7, 0xa7, 0x15, 0x5a, 0x71, 0x66, 0x42, 0xbf, + 0x26, 0x4a, 0x6b, 0x98, 0xfa, 0xea, 0x77, 0x53, 0xb2, 0x70, 0x05, 0x2c, 0xfd, 0x59, 0x3a, 0x86, + 0x7e, 0xce, 0x06, 0xeb, 0x82, 0x78, 0x57, 0xc7, 0x8d, 0x43, 0xaf, 0xb4, 0x1c, 0xd4, 0x5b, 0xcd, + 0xe2, 0xe9, 0x27, 0x4f, 0xc3, 0x08, 0x72, 0x80, 0xcf, 0xb0, 0xef, 0xf5, 0x28, 0x6d, 0xbe, 0x30, + 0x4d, 0x34, 0x92, 0xd5, 0x0e, 0x3c, 0x22, 0x32, 0xe5, 0xe4, 0xf9, 0x9f, 0xc2, 0xd1, 0x0a, 0x81, + 0x12, 0xe1, 0xee, 0x91, 0x83, 0x76, 0xe3, 0x97, 0xe6, 0x61, 0x8a, 0x17, 0x79, 0xa4, 0xb7, 0xdc, + 0x90, 0x7a, 0x5c, 0x8c, 0x02, 0xa6, 0xca, 0x69, 0xde, 0x50, 0x1a, 0x11, 0x93, 0xb9, 0x52, 0x87, + 0x58, 0xfc, 0xed, 0x1d, 0x37, 0x49, 0x1b, 0x6a, 0xe0, 0x29, 0x33, 0x99, 0xbd, 0x6c, 0xd9, 0x94, + 0xf3, 0x40, 0x54, 0x6f, 0xf0, 0xc6, 0x73, 0xb8, 0xd6, 0x3e, 0x65, 0x18, 0x44, 0x1f, 0xdd, 0x67, + 0x10, 0xf1, 0x0c, 0x19, 0xec, 0xae, 0x03, 0xa1, 0x14, 0x7b, 0xa9, 0x0b, 0xff, 0xf8, 0xa3, 0xc0, + 0xa2, 0x01, 0xf7, 0x2e, 0xbc, 0x24, 0x68, 0x75, 0x0d, 0xfe, 0xba, 0x2f, 0xb5, 0xd0, 0xda, 0x3d +}; + +static unsigned char comp_high2 [] = { + 0x14, 0x53, 0x0f, 0x56, 0xb3, 0xc8, 0x7a, 0x9c, 0xeb, 0x65, 0x48, 0x17, 0x16, 0x15, 0x9f, 0x02, + 0xcc, 0x54, 0x7c, 0x83, 0x00, 0x0d, 0x0c, 0x0b, 0xa2, 0x62, 0xa8, 0x76, 0xdb, 0xd9, 0xed, 0xc7, + 0xc5, 0xa4, 0xdc, 0xac, 0x85, 0x74, 0xd6, 0xd0, 0xa7, 0x9b, 0xae, 0x9a, 0x96, 0x71, 0x66, 0xc3, + 0x63, 0x99, 0xb8, 0xdd, 0x73, 0x92, 0x8e, 0x84, 0x7d, 0xa5, 0x5e, 0xd1, 0x5d, 0x93, 0xb1, 0x57, + 0x51, 0x50, 0x80, 0x89, 0x52, 0x94, 0x4f, 0x4e, 0x0a, 0x6b, 0xbc, 0x8d, 0x7f, 0x6e, 0x47, 0x46, + 0x41, 0x40, 0x44, 0x01, 0x11, 0xcb, 0x03, 0x3f, 0xf7, 0xf4, 0xe1, 0xa9, 0x8f, 0x3c, 0x3a, 0xf9, + 0xfb, 0xf0, 0x19, 0x30, 0x82, 0x09, 0x2e, 0xc9, 0x9d, 0xa0, 0x86, 0x49, 0xee, 0x6f, 0x4d, 0x6d, + 0xc4, 0x2d, 0x81, 0x34, 0x25, 0x87, 0x1b, 0x88, 0xaa, 0xfc, 0x06, 0xa1, 0x12, 0x38, 0xfd, 0x4c, + 0x42, 0x72, 0x64, 0x13, 0x37, 0x24, 0x6a, 0x75, 0x77, 0x43, 0xff, 0xe6, 0xb4, 0x4b, 0x36, 0x5c, + 0xe4, 0xd8, 0x35, 0x3d, 0x45, 0xb9, 0x2c, 0xec, 0xb7, 0x31, 0x2b, 0x29, 0x07, 0x68, 0xa3, 0x0e, + 0x69, 0x7b, 0x18, 0x9e, 0x21, 0x39, 0xbe, 0x28, 0x1a, 0x5b, 0x78, 0xf5, 0x23, 0xca, 0x2a, 0xb0, + 0xaf, 0x3e, 0xfe, 0x04, 0x8c, 0xe7, 0xe5, 0x98, 0x32, 0x95, 0xd3, 0xf6, 0x4a, 0xe8, 0xa6, 0xea, + 0xe9, 0xf3, 0xd5, 0x2f, 0x70, 0x20, 0xf2, 0x1f, 0x05, 0x67, 0xad, 0x55, 0x10, 0xce, 0xcd, 0xe3, + 0x27, 0x3b, 0xda, 0xba, 0xd7, 0xc2, 0x26, 0xd4, 0x91, 0x1d, 0xd2, 0x1c, 0x22, 0x33, 0xf8, 0xfa, + 0xf1, 0x5a, 0xef, 0xcf, 0x90, 0xb6, 0x8b, 0xb5, 0xbd, 0xc0, 0xbf, 0x08, 0x97, 0x1e, 0x6c, 0xe2, + 0x61, 0xe0, 0xc6, 0xc1, 0x59, 0xab, 0xbb, 0x58, 0xde, 0x5f, 0xdf, 0x60, 0x79, 0x7e, 0xb2, 0x8a +}; int pst_open(pst_file *pf, char *name) { int32_t sig; @@ -2316,12 +2338,11 @@ DEBUG_EMAIL(("%s\n", item->email->rtf_body_tag)); break; case 0x1009: // PR_RTF_COMPRESSED - // some compression algorithm has been applied to this. At present - // it is unknown + // rtf data is lzw compressed DEBUG_EMAIL(("RTF Compressed body - ")); MALLOC_EMAIL(item); LIST_COPY_SIZE(item->email->rtf_compressed, (char*), item->email->rtf_compressed_size); - DEBUG_EMAIL(("NOT PRINTED\n")); + //DEBUG_EMAIL_HEXPRINT((char*)item->email->rtf_compressed, item->email->rtf_compressed_size); break; case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT // a count of the ignored characters before the first significant character @@ -3129,6 +3150,7 @@ memcpy(item->message_store->top_of_folder, list->items[x]->data, sizeof(pst_entryid)); LE32_CPU(item->message_store->top_of_folder->u1); LE32_CPU(item->message_store->top_of_folder->id); + DEBUG_EMAIL(("u1 %#x id %#x\n", item->message_store->top_of_folder->u1, item->message_store->top_of_folder->id)); DEBUG_EMAIL_HEXPRINT((char*)item->message_store->top_of_folder->entryid, 16); break; case 0x8005: // Contact's Fullname @@ -4194,7 +4216,7 @@ } -int pst_decrypt(char *buf, size_t size, unsigned char type) { +int pst_decrypt(uint64_t id, char *buf, size_t size, unsigned char type) { size_t x = 0; unsigned char y; DEBUG_ENT("pst_decrypt"); @@ -4207,10 +4229,31 @@ x = 0; while (x < size) { y = (unsigned char)(buf[x]); - DEBUG_DECRYPT(("Transposing %#hhx to %#hhx [%#x]\n", buf[x], comp_enc[y], y)); buf[x] = (char)comp_enc[y]; // transpose from encrypt array x++; } + + } else if (type == PST_ENCRYPT) { + // The following code was based on the information at + // http://www.passcape.com/outlook_passwords.htm + uint16_t salt = (uint16_t) (((id & 0x00000000ffff0000) >> 16) ^ (id & 0x000000000000ffff)); + x = 0; + while (x < size) { + uint8_t losalt = (salt & 0x00ff); + uint8_t hisalt = (salt & 0xff00) >> 8; + y = (unsigned char)buf[x]; + y += losalt; + y = comp_high1[y]; + y += hisalt; + y = comp_high2[y]; + y -= hisalt; + y = comp_enc[y]; + y -= losalt; + buf[x] = (char)y; + x++; + salt++; + } + } else { WARN(("Unknown encryption: %i. Cannot decrypt\n", type)); DEBUG_RET(); @@ -4313,7 +4356,7 @@ DEBUG_INDEX(("for id %#x\n", id)); r = pst_ff_getIDblock(pf, id, buf); if ((pf->encryption) && !(noenc)) { - (void)pst_decrypt(*buf, r, pf->encryption); + (void)pst_decrypt(id, *buf, r, pf->encryption); } DEBUG_HEXDUMPC(*buf, r, 16); DEBUG_RET(); @@ -4423,7 +4466,7 @@ if (block_hdr.index_offset != (uint16_t)0x0101) { //type 3 DEBUG_WARN(("WARNING: not a type 0x0101 buffer, Treating as normal buffer\n")); - if (pf->encryption) (void)pst_decrypt(buf3, a, pf->encryption); + if (pf->encryption) (void)pst_decrypt(id, buf3, a, pf->encryption); if (h->buf) *(h->buf) = buf3; else if (h->base64 == 1 && h->fp) {
--- a/src/libpst.h Tue Jun 10 14:28:55 2008 -0700 +++ b/src/libpst.h Fri Jun 13 20:47:01 2008 -0700 @@ -57,23 +57,23 @@ #endif // BYTE_ORDER -#define PST_TYPE_NOTE 1 +#define PST_TYPE_NOTE 1 #define PST_TYPE_APPOINTMENT 8 -#define PST_TYPE_CONTACT 9 -#define PST_TYPE_JOURNAL 10 +#define PST_TYPE_CONTACT 9 +#define PST_TYPE_JOURNAL 10 #define PST_TYPE_STICKYNOTE 11 -#define PST_TYPE_TASK 12 -#define PST_TYPE_OTHER 13 -#define PST_TYPE_REPORT 14 +#define PST_TYPE_TASK 12 +#define PST_TYPE_OTHER 13 +#define PST_TYPE_REPORT 14 // defines whether decryption is done on this bit of data #define PST_NO_ENC 0 -#define PST_ENC 1 +#define PST_ENC 1 // defines types of possible encryption -#define PST_NO_ENCRYPT 0 +#define PST_NO_ENCRYPT 0 #define PST_COMP_ENCRYPT 1 -#define PST_ENCRYPT 2 +#define PST_ENCRYPT 2 // defines different types of mappings #define PST_MAP_ATTRIB (uint32_t)1 @@ -587,7 +587,7 @@ pst_index_ll* pst_getID2(pst_index2_ll * ptr, uint64_t id); pst_desc_ll* pst_getDptr(pst_file *pf, uint64_t id); size_t pst_read_block_size(pst_file *pf, off_t offset, size_t size, char **buf); -int pst_decrypt(char *buf, size_t size, unsigned char type); +int pst_decrypt(uint64_t id, char *buf, size_t size, unsigned char type); uint64_t pst_getIntAt(pst_file *pf, char *buf); uint64_t pst_getIntAtPos(pst_file *pf, off_t pos); size_t pst_getAtPos(pst_file *pf, off_t pos, void* buf, size_t size);
--- a/src/lzfu.c Tue Jun 10 14:28:55 2008 -0700 +++ b/src/lzfu.c Fri Jun 13 20:47:01 2008 -0700 @@ -40,26 +40,23 @@ } lzfuheader; -char* lzfu_decompress (char* rtfcomp, uint32_t compsize, size_t *size) { - // the dictionary buffer - unsigned char dict[4096]; - // the dictionary pointer - unsigned int dict_length=0; - // the header of the lzfu block - lzfuheader lzfuhdr; - // container for the data blocks - unsigned char flags; - // temp value for determining the bits in the flag - unsigned char flag_mask; +char* lzfu_decompress(char* rtfcomp, uint32_t compsize, size_t *size) { + unsigned char dict[4096]; // the dictionary buffer + unsigned int dict_length = 0; // the dictionary pointer + lzfuheader lzfuhdr; // the header of the lzfu block + unsigned char flags; // 8 bits of flags (1=2byte block pointer into the dict, 0=1 byte literal) + unsigned char flag_mask; // look at one flag bit each time thru the loop uint32_t i; - char *out_buf; + char *out_buf; uint32_t out_ptr = 0; uint32_t out_size; uint32_t in_ptr; uint32_t in_size; memcpy(dict, LZFU_INITDICT, LZFU_INITLENGTH); + memset(dict + LZFU_INITLENGTH, 0, sizeof(dict) - LZFU_INITLENGTH); dict_length = LZFU_INITLENGTH; + memcpy(&lzfuhdr, rtfcomp, sizeof(lzfuhdr)); LE32_CPU(lzfuhdr.cbSize); LE32_CPU(lzfuhdr.cbRawSize); @@ -99,7 +96,7 @@ for (i=0; i < length; i++) { unsigned char c1; c1 = dict[(offset+i)%4096]; - dict[dict_length]=c1; + dict[dict_length] = c1; dict_length = (dict_length+1) % 4096; if (out_ptr < out_size) out_buf[out_ptr++] = (char)c1; // required for dictionary wrap around
--- a/src/pst2dii.cpp.in Tue Jun 10 14:28:55 2008 -0700 +++ b/src/pst2dii.cpp.in Fri Jun 13 20:47:01 2008 -0700 @@ -620,11 +620,6 @@ item = pst_parse_item(&pstfile, d_ptr); DEBUG_INFO(("item pointer is %p\n", item)); if (item) { - if (item->message_store) { - // there should only be one message_store, and we have already done it - DIE(("main: A second message_store has been found. Sorry, this must be an error.\n")); - } - if (item->folder && d_ptr->child ) { //if this is a non-empty folder, we want to recurse into it fprintf(stderr, "entering folder %s\n", item->file_as); @@ -636,7 +631,7 @@ DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n")); } write_normal_email(ff, item, &pstfile); - } + } pst_freeItem(item); } else { ff.skip_count++;
--- a/src/pst2ldif.cpp Tue Jun 10 14:28:55 2008 -0700 +++ b/src/pst2ldif.cpp Fri Jun 13 20:47:01 2008 -0700 @@ -124,213 +124,116 @@ item = pst_parse_item(&pstfile, d_ptr); DEBUG_INFO(("item pointer is %p\n", item)); if (item) { - if (item->message_store) { - // there should only be one message_store, and we have already done it - DIE(("main: A second message_store has been found. Sorry, this must be an error.\n")); - } - if (item->folder && d_ptr->child && strcasecmp(item->file_as, "Deleted Items")) { //if this is a non-empty folder other than deleted items, we want to recurse into it fprintf(stderr, "entering folder %s\n", item->file_as); process(d_ptr->child); - } else if (item->contact) { + + } else if (item->contact && (item->type == PST_TYPE_CONTACT)) { // deal with a contact - if (item->type != PST_TYPE_CONTACT) { - DIE(("type should be contact\n")); - } - else if (item->contact == NULL) { // this is an incorrect situation. Inform user - DIE(("null item contact\n")); - } else { - char cn[1000]; - snprintf(cn, sizeof(cn), "%s %s %s %s", - single(item->contact->display_name_prefix), - single(item->contact->first_name), - single(item->contact->surname), - single(item->contact->suffix)); - if (strcmp(cn, " ")) { -// fprintf(stderr, "\n\n\n"); -// fprintf(stderr, "access_method %s\n", item->contact->access_method); -// fprintf(stderr, "account_name %s\n", item->contact->account_name); -// fprintf(stderr, "address1 %s\n", item->contact->address1); -// fprintf(stderr, "address1_desc %s\n", item->contact->address1_desc); -// fprintf(stderr, "address1_transport %s\n", item->contact->address1_transport); -// fprintf(stderr, "address2 %s\n", item->contact->address2); -// fprintf(stderr, "address2_desc %s\n", item->contact->address2_desc); -// fprintf(stderr, "address2_transport %s\n", item->contact->address2_transport); -// fprintf(stderr, "address3 %s\n", item->contact->address3); -// fprintf(stderr, "address3_desc %s\n", item->contact->address3_desc); -// fprintf(stderr, "address3_transport %s\n", item->contact->address3_transport); -// fprintf(stderr, "assistant_name %s\n", item->contact->assistant_name); -// fprintf(stderr, "assistant_phone %s\n", item->contact->assistant_phone); -// fprintf(stderr, "billing_information %s\n", item->contact->billing_information); -// fprintf(stderr, "business_address %s\n", item->contact->business_address); -// fprintf(stderr, "business_city %s\n", item->contact->business_city); -// fprintf(stderr, "business_country %s\n", item->contact->business_country); -// fprintf(stderr, "business_fax %s\n", item->contact->business_fax); -// fprintf(stderr, "business_homepage %s\n", item->contact->business_homepage); -// fprintf(stderr, "business_phone %s\n", item->contact->business_phone); -// fprintf(stderr, "business_phone2 %s\n", item->contact->business_phone2); -// fprintf(stderr, "business_po_box %s\n", item->contact->business_po_box); -// fprintf(stderr, "business_postal_code %s\n", item->contact->business_postal_code); -// fprintf(stderr, "business_state %s\n", item->contact->business_state); -// fprintf(stderr, "business_street %s\n", item->contact->business_street); -// fprintf(stderr, "callback_phone %s\n", item->contact->callback_phone); -// fprintf(stderr, "car_phone %s\n", item->contact->car_phone); -// fprintf(stderr, "company_main_phone %s\n", item->contact->company_main_phone); -// fprintf(stderr, "company_name %s\n", item->contact->company_name); -// fprintf(stderr, "computer_name %s\n", item->contact->computer_name); -// fprintf(stderr, "customer_id %s\n", item->contact->customer_id); -// fprintf(stderr, "def_postal_address %s\n", item->contact->def_postal_address); -// fprintf(stderr, "department %s\n", item->contact->department); -// fprintf(stderr, "display_name_prefix %s\n", item->contact->display_name_prefix); -// fprintf(stderr, "first_name %s\n", item->contact->first_name); -// fprintf(stderr, "followup %s\n", item->contact->followup); -// fprintf(stderr, "free_busy_address %s\n", item->contact->free_busy_address); -// fprintf(stderr, "ftp_site %s\n", item->contact->ftp_site); -// fprintf(stderr, "fullname %s\n", item->contact->fullname); -// fprintf(stderr, "gov_id %s\n", item->contact->gov_id); -// fprintf(stderr, "hobbies %s\n", item->contact->hobbies); -// fprintf(stderr, "home_address %s\n", item->contact->home_address); -// fprintf(stderr, "home_city %s\n", item->contact->home_city); -// fprintf(stderr, "home_country %s\n", item->contact->home_country); -// fprintf(stderr, "home_fax %s\n", item->contact->home_fax); -// fprintf(stderr, "home_phone %s\n", item->contact->home_phone); -// fprintf(stderr, "home_phone2 %s\n", item->contact->home_phone2); -// fprintf(stderr, "home_po_box %s\n", item->contact->home_po_box); -// fprintf(stderr, "home_postal_code %s\n", item->contact->home_postal_code); -// fprintf(stderr, "home_state %s\n", item->contact->home_state); -// fprintf(stderr, "home_street %s\n", item->contact->home_street); -// fprintf(stderr, "initials %s\n", item->contact->initials); -// fprintf(stderr, "isdn_phone %s\n", item->contact->isdn_phone); -// fprintf(stderr, "job_title %s\n", item->contact->job_title); -// fprintf(stderr, "keyword %s\n", item->contact->keyword); -// fprintf(stderr, "language %s\n", item->contact->language); -// fprintf(stderr, "location %s\n", item->contact->location); -// fprintf(stderr, "manager_name %s\n", item->contact->manager_name); -// fprintf(stderr, "middle_name %s\n", item->contact->middle_name); -// fprintf(stderr, "mileage %s\n", item->contact->mileage); -// fprintf(stderr, "mobile_phone %s\n", item->contact->mobile_phone); -// fprintf(stderr, "nickname %s\n", item->contact->nickname); -// fprintf(stderr, "office_loc %s\n", item->contact->office_loc); -// fprintf(stderr, "org_id %s\n", item->contact->org_id); -// fprintf(stderr, "other_address %s\n", item->contact->other_address); -// fprintf(stderr, "other_city %s\n", item->contact->other_city); -// fprintf(stderr, "other_country %s\n", item->contact->other_country); -// fprintf(stderr, "other_phone %s\n", item->contact->other_phone); -// fprintf(stderr, "other_po_box %s\n", item->contact->other_po_box); -// fprintf(stderr, "other_postal_code %s\n", item->contact->other_postal_code); -// fprintf(stderr, "other_state %s\n", item->contact->other_state); -// fprintf(stderr, "other_street %s\n", item->contact->other_street); -// fprintf(stderr, "pager_phone %s\n", item->contact->pager_phone); -// fprintf(stderr, "personal_homepage %s\n", item->contact->personal_homepage); -// fprintf(stderr, "pref_name %s\n", item->contact->pref_name); -// fprintf(stderr, "primary_fax %s\n", item->contact->primary_fax); -// fprintf(stderr, "primary_phone %s\n", item->contact->primary_phone); -// fprintf(stderr, "profession %s\n", item->contact->profession); -// fprintf(stderr, "radio_phone %s\n", item->contact->radio_phone); -// fprintf(stderr, "spouse_name %s\n", item->contact->spouse_name); -// fprintf(stderr, "suffix %s\n", item->contact->suffix); -// fprintf(stderr, "surname %s\n", item->contact->surname); -// fprintf(stderr, "telex %s\n", item->contact->telex); -// fprintf(stderr, "transmittable_display_name %s\n", item->contact->transmittable_display_name); -// fprintf(stderr, "ttytdd_phone %s\n", item->contact->ttytdd_phone); - // have a valid cn - const char *ucn = unique_string(folded(trim(cn))); - printf("dn: cn=%s, %s\n", ucn, ldap_base); - printf("cn: %s\n", ucn); - if (item->contact->first_name) { - snprintf(cn, sizeof(cn), "%s %s", - single(item->contact->display_name_prefix), - single(item->contact->first_name)); - printf("givenName: %s\n", trim(cn)); - } - if (item->contact->surname) { - snprintf(cn, sizeof(cn), "%s %s", - single(item->contact->surname), - single(item->contact->suffix)); - printf("sn: %s\n", trim(cn)); - } - else if (item->contact->company_name) { - printf("sn: %s\n", single(item->contact->company_name)); - } - else - printf("sn: %s\n", ucn); // use cn as sn if we cannot find something better + char cn[1000]; + snprintf(cn, sizeof(cn), "%s %s %s %s", + single(item->contact->display_name_prefix), + single(item->contact->first_name), + single(item->contact->surname), + single(item->contact->suffix)); + if (strcmp(cn, " ")) { + // have a valid cn + const char *ucn = unique_string(folded(trim(cn))); + printf("dn: cn=%s, %s\n", ucn, ldap_base); + printf("cn: %s\n", ucn); + if (item->contact->first_name) { + snprintf(cn, sizeof(cn), "%s %s", + single(item->contact->display_name_prefix), + single(item->contact->first_name)); + printf("givenName: %s\n", trim(cn)); + } + if (item->contact->surname) { + snprintf(cn, sizeof(cn), "%s %s", + single(item->contact->surname), + single(item->contact->suffix)); + printf("sn: %s\n", trim(cn)); + } + else if (item->contact->company_name) { + printf("sn: %s\n", single(item->contact->company_name)); + } + else + printf("sn: %s\n", ucn); // use cn as sn if we cannot find something better - if (item->contact->job_title) - printf("personalTitle: %s\n", single(item->contact->job_title)); - if (item->contact->company_name) - printf("company: %s\n", single(item->contact->company_name)); - if (item->contact->address1 && *item->contact->address1) - printf("mail: %s\n", single(item->contact->address1)); - if (item->contact->address2 && *item->contact->address2) - printf("mail: %s\n", single(item->contact->address2)); - if (item->contact->address3 && *item->contact->address3) - printf("mail: %s\n", single(item->contact->address3)); - if (item->contact->address1a && *item->contact->address1a) - printf("mail: %s\n", single(item->contact->address1a)); - if (item->contact->address2a && *item->contact->address2a) - printf("mail: %s\n", single(item->contact->address2a)); - if (item->contact->address3a && *item->contact->address3a) - printf("mail: %s\n", single(item->contact->address3a)); - if (item->contact->business_address) { - if (item->contact->business_po_box) - printf("postalAddress: %s\n", single(item->contact->business_po_box)); - if (item->contact->business_street) - multi("postalAddress: %s\n", item->contact->business_street); - if (item->contact->business_city) - printf("l: %s\n", single(item->contact->business_city)); - if (item->contact->business_state) - printf("st: %s\n", single(item->contact->business_state)); - if (item->contact->business_postal_code) - printf("postalCode: %s\n", single(item->contact->business_postal_code)); - } - else if (item->contact->home_address) { - if (item->contact->home_po_box) - printf("postalAddress: %s\n", single(item->contact->home_po_box)); - if (item->contact->home_street) - multi("postalAddress: %s\n", item->contact->home_street); - if (item->contact->home_city) - printf("l: %s\n", single(item->contact->home_city)); - if (item->contact->home_state) - printf("st: %s\n", single(item->contact->home_state)); - if (item->contact->home_postal_code) - printf("postalCode: %s\n", single(item->contact->home_postal_code)); - } - else if (item->contact->other_address) { - if (item->contact->other_po_box) - printf("postalAddress: %s\n", single(item->contact->other_po_box)); - if (item->contact->other_street) - multi("postalAddress: %s\n", item->contact->other_street); - if (item->contact->other_city) - printf("l: %s\n", single(item->contact->other_city)); - if (item->contact->other_state) - printf("st: %s\n", single(item->contact->other_state)); - if (item->contact->other_postal_code) - printf("postalCode: %s\n", single(item->contact->other_postal_code)); - } - if (item->contact->business_fax) - printf("facsimileTelephoneNumber: %s\n", single(item->contact->business_fax)); - else if (item->contact->home_fax) - printf("facsimileTelephoneNumber: %s\n", single(item->contact->home_fax)); + if (item->contact->job_title) + printf("personalTitle: %s\n", single(item->contact->job_title)); + if (item->contact->company_name) + printf("company: %s\n", single(item->contact->company_name)); + if (item->contact->address1 && *item->contact->address1) + printf("mail: %s\n", single(item->contact->address1)); + if (item->contact->address2 && *item->contact->address2) + printf("mail: %s\n", single(item->contact->address2)); + if (item->contact->address3 && *item->contact->address3) + printf("mail: %s\n", single(item->contact->address3)); + if (item->contact->address1a && *item->contact->address1a) + printf("mail: %s\n", single(item->contact->address1a)); + if (item->contact->address2a && *item->contact->address2a) + printf("mail: %s\n", single(item->contact->address2a)); + if (item->contact->address3a && *item->contact->address3a) + printf("mail: %s\n", single(item->contact->address3a)); + if (item->contact->business_address) { + if (item->contact->business_po_box) + printf("postalAddress: %s\n", single(item->contact->business_po_box)); + if (item->contact->business_street) + multi("postalAddress: %s\n", item->contact->business_street); + if (item->contact->business_city) + printf("l: %s\n", single(item->contact->business_city)); + if (item->contact->business_state) + printf("st: %s\n", single(item->contact->business_state)); + if (item->contact->business_postal_code) + printf("postalCode: %s\n", single(item->contact->business_postal_code)); + } + else if (item->contact->home_address) { + if (item->contact->home_po_box) + printf("postalAddress: %s\n", single(item->contact->home_po_box)); + if (item->contact->home_street) + multi("postalAddress: %s\n", item->contact->home_street); + if (item->contact->home_city) + printf("l: %s\n", single(item->contact->home_city)); + if (item->contact->home_state) + printf("st: %s\n", single(item->contact->home_state)); + if (item->contact->home_postal_code) + printf("postalCode: %s\n", single(item->contact->home_postal_code)); + } + else if (item->contact->other_address) { + if (item->contact->other_po_box) + printf("postalAddress: %s\n", single(item->contact->other_po_box)); + if (item->contact->other_street) + multi("postalAddress: %s\n", item->contact->other_street); + if (item->contact->other_city) + printf("l: %s\n", single(item->contact->other_city)); + if (item->contact->other_state) + printf("st: %s\n", single(item->contact->other_state)); + if (item->contact->other_postal_code) + printf("postalCode: %s\n", single(item->contact->other_postal_code)); + } + if (item->contact->business_fax) + printf("facsimileTelephoneNumber: %s\n", single(item->contact->business_fax)); + else if (item->contact->home_fax) + printf("facsimileTelephoneNumber: %s\n", single(item->contact->home_fax)); - if (item->contact->business_phone) - printf("telephoneNumber: %s\n", single(item->contact->business_phone)); - if (item->contact->home_phone) - printf("homePhone: %s\n", single(item->contact->home_phone)); + if (item->contact->business_phone) + printf("telephoneNumber: %s\n", single(item->contact->business_phone)); + if (item->contact->home_phone) + printf("homePhone: %s\n", single(item->contact->home_phone)); - if (item->contact->car_phone) - printf("mobile: %s\n", single(item->contact->car_phone)); - else if (item->contact->mobile_phone) - printf("mobile: %s\n", single(item->contact->mobile_phone)); - else if (item->contact->other_phone) - printf("mobile: %s\n", single(item->contact->other_phone)); + if (item->contact->car_phone) + printf("mobile: %s\n", single(item->contact->car_phone)); + else if (item->contact->mobile_phone) + printf("mobile: %s\n", single(item->contact->mobile_phone)); + else if (item->contact->other_phone) + printf("mobile: %s\n", single(item->contact->other_phone)); - if (item->comment) - printf("description: %s\n", single(item->comment)); + if (item->comment) + printf("description: %s\n", single(item->comment)); - printf("objectClass: %s\n\n", ldap_class); - } + printf("objectClass: %s\n\n", ldap_class); } } else {
--- a/src/readpst.c Tue Jun 10 14:28:55 2008 -0700 +++ b/src/readpst.c Fri Jun 13 20:47:01 2008 -0700 @@ -133,11 +133,6 @@ DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj)); } if (item) { - if (item->message_store) { - // there should only be one message_store, and we have already done it - DIE(("main: A second message_store has been found. Sorry, this must be an error.\n")); - } - if (item->folder && d_ptr->child && strcasecmp(item->file_as, "Deleted Items")) { //if this is a non-empty folder other than deleted items, we want to recurse into it if (output_mode != OUTPUT_QUIET) printf("Processing Folder \"%s\"\n", item->file_as); @@ -194,6 +189,10 @@ } write_appointment(ff.output, item->appointment, item->email, item->create_date, item->modify_date); + } else if (item->message_store) { + // there should only be one message_store, and we have already done it + DEBUG_MAIN(("item with message store content, type %i %s folder type %i, skipping it\n", item->type, item->ascii_type, ff.type)); + } else { // these all seem to be things that MS agrees are not included in the item count //ff.skip_count++; @@ -308,7 +307,7 @@ } while (0 != (l = fread(buf, 1, 1024, fp))) { - if (0 != pst_decrypt(buf, l, PST_COMP_ENCRYPT)) + if (0 != pst_decrypt(0, buf, l, PST_COMP_ENCRYPT)) fprintf(stderr, "pst_decrypt() failed (I'll try to continue)\n"); if (l != pst_fwrite(buf, 1, l, stdout)) { @@ -413,7 +412,7 @@ version(); printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name); printf("OPTIONS:\n"); - printf("\t-C\t- Decrypt the entire file and output on stdout (not typically useful)\n"); + printf("\t-C\t- Decrypt (compressible encryption) the entire file and output on stdout (not typically useful)\n"); printf("\t-M\t- MH. Write emails in the MH format\n"); printf("\t-S\t- Separate. Write emails in the separate format\n"); printf("\t-V\t- Version. Display program version\n");
--- a/xml/libpst.in Tue Jun 10 14:28:55 2008 -0700 +++ b/xml/libpst.in Fri Jun 13 20:47:01 2008 -0700 @@ -33,7 +33,7 @@ <refentry id="readpst.1"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -226,7 +226,7 @@ <refentry id="lspst.1"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -329,7 +329,7 @@ <refentry id="readpstlog.1"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -504,7 +504,7 @@ <refentry id="pst2ldif.1"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -628,7 +628,7 @@ <refentry id="pst2dii.1"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -762,7 +762,7 @@ <refentry id="pst.5"> <refentryinfo> - <date>2008-06-03</date> + <date>2008-06-13</date> </refentryinfo> <refmeta> @@ -843,10 +843,11 @@ ]]></literallayout> <para> We only support index types 0x0e and 0x17, and encryption types - 0x00 and 0x01. Index type 0x0e is the older 32 bit Outlook format. + 0x00, 0x01 and 0x02. Index type 0x0e is the older 32 bit Outlook format. Index type 0x17 is the newer 64 bit Outlook format. Encryption - type 0x00 is no encryption, and type 0x01 is the only other supported - encryption type. + type 0x00 is no encryption, type 0x01 is "compressible" encryption + which is a simple substitution cipher, and type 0x02 is "strong" + encryption, which seems to be related to a three rotor Enigma cipher. </para> <para> offsetIndex1 is the file offset of the root of the