Fixed g++ build
This commit is contained in:
planetbeing
Родитель
1a9962128d
Коммит
2fb2b51d31
|
|
@ -54,7 +54,7 @@ static void writeChunk(FileVaultInfo* info) {
|
|||
|
||||
FLIPENDIAN(myChunk);
|
||||
HMAC_Init_ex(&(info->hmacCTX), NULL, 0, NULL, NULL);
|
||||
HMAC_Update(&(info->hmacCTX), (void *) &myChunk, sizeof(uint32_t));
|
||||
HMAC_Update(&(info->hmacCTX), (unsigned char *) &myChunk, sizeof(uint32_t));
|
||||
HMAC_Final(&(info->hmacCTX), msgDigest, &msgDigestLen);
|
||||
|
||||
AES_cbc_encrypt(info->chunk, buffer, FILEVAULT_CHUNK_SIZE, &(info->aesEncKey), msgDigest, AES_ENCRYPT);
|
||||
|
|
@ -88,7 +88,7 @@ static void cacheChunk(FileVaultInfo* info, uint32_t chunk) {
|
|||
|
||||
FLIPENDIAN(chunk);
|
||||
HMAC_Init_ex(&(info->hmacCTX), NULL, 0, NULL, NULL);
|
||||
HMAC_Update(&(info->hmacCTX), (void *) &chunk, sizeof(uint32_t));
|
||||
HMAC_Update(&(info->hmacCTX), (unsigned char *) &chunk, sizeof(uint32_t));
|
||||
HMAC_Final(&(info->hmacCTX), msgDigest, &msgDigestLen);
|
||||
|
||||
AES_cbc_encrypt(buffer, info->chunk, FILEVAULT_CHUNK_SIZE, &(info->aesKey), msgDigest, AES_DECRYPT);
|
||||
|
|
|
|||
|
|
@ -198,6 +198,46 @@
|
|||
<array/>
|
||||
<key>OpenEditors</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>Content</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>63DCCB0D0DC49C84005D833C</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>filevault.c</string>
|
||||
<key>PBXSplitModuleInNavigatorKey</key>
|
||||
<dict>
|
||||
<key>Split0</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>63DCCB0E0DC49C84005D833C</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>filevault.c</string>
|
||||
<key>_historyCapacity</key>
|
||||
<integer>0</integer>
|
||||
<key>bookmark</key>
|
||||
<string>63DCCB0F0DC49C84005D833C</string>
|
||||
<key>history</key>
|
||||
<array>
|
||||
<string>63DCCB0C0DC49C00005D833C</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
<string>1</string>
|
||||
</dict>
|
||||
<key>StatusBarVisibility</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>Geometry</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 20}, {1150, 736}}</string>
|
||||
<key>PBXModuleWindowStatusBarHidden2</key>
|
||||
<false/>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>15 220 1150 777 0 0 1280 1002 </string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Content</key>
|
||||
<dict>
|
||||
|
|
@ -216,10 +256,10 @@
|
|||
<key>_historyCapacity</key>
|
||||
<integer>0</integer>
|
||||
<key>bookmark</key>
|
||||
<string>63EFCCEB0DC49BA00031F8B4</string>
|
||||
<string>63DCCB100DC49C84005D833C</string>
|
||||
<key>history</key>
|
||||
<array>
|
||||
<string>637FAC760DC495B900D1D35F</string>
|
||||
<string>63EFCCEB0DC49BA00031F8B4</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
|
|
@ -272,6 +312,8 @@
|
|||
<key>Layout</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXBottomSmartGroupGIDs</key>
|
||||
|
|
@ -314,20 +356,19 @@
|
|||
<string>C6A0FF2B0290797F04C91782</string>
|
||||
<string>1AB674ADFE9D54B511CA2CBB</string>
|
||||
<string>1C37FBAC04509CD000000102</string>
|
||||
<string>63EFCCE40DC49B410031F8B4</string>
|
||||
<string>63EFCCE50DC49B410031F8B4</string>
|
||||
<string>63EFCCE60DC49B410031F8B4</string>
|
||||
<string>1C37FABC05509CD000000102</string>
|
||||
</array>
|
||||
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
|
||||
<array>
|
||||
<array>
|
||||
<integer>38</integer>
|
||||
<integer>35</integer>
|
||||
<integer>20</integer>
|
||||
<integer>14</integer>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</array>
|
||||
</array>
|
||||
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
|
||||
<string>{{0, 0}, {265, 494}}</string>
|
||||
<string>{{0, 2}, {265, 494}}</string>
|
||||
</dict>
|
||||
<key>PBXTopSmartGroupGIDs</key>
|
||||
<array/>
|
||||
|
|
@ -391,8 +432,6 @@
|
|||
<string>0pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
|
|
@ -429,9 +468,9 @@
|
|||
</array>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>63EFCCBE0DC4974F0031F8B4</string>
|
||||
<string>63DCCB090DC49BFA005D833C</string>
|
||||
<string>1CE0B1FE06471DED0097A5F4</string>
|
||||
<string>63EFCCBF0DC4974F0031F8B4</string>
|
||||
<string>63DCCB0A0DC49BFA005D833C</string>
|
||||
<string>1CE0B20306471E060097A5F4</string>
|
||||
<string>1CE0B20506471E060097A5F4</string>
|
||||
</array>
|
||||
|
|
@ -566,8 +605,8 @@
|
|||
<key>WindowOrderList</key>
|
||||
<array>
|
||||
<string>63F9228D0DC4952F0056EA77</string>
|
||||
<string>63F922260DC492000056EA77</string>
|
||||
<string>/Users/david/libdmg-hfsplus/ide/xcode/libdmg-hfsplus.xcodeproj</string>
|
||||
<string>63DCCB0D0DC49C84005D833C</string>
|
||||
</array>
|
||||
<key>WindowString</key>
|
||||
<string>60 356 799 553 0 0 1280 1002 </string>
|
||||
|
|
|
|||
|
|
@ -71,11 +71,13 @@
|
|||
PBXFileDataSource_Warnings_ColumnID,
|
||||
);
|
||||
};
|
||||
PBXPerProjectTemplateStateSaveDate = 230987379;
|
||||
PBXWorkspaceStateSaveDate = 230987379;
|
||||
PBXPerProjectTemplateStateSaveDate = 230988791;
|
||||
PBXWorkspaceStateSaveDate = 230988791;
|
||||
};
|
||||
perUserProjectItems = {
|
||||
637FAC760DC495B900D1D35F /* PBXTextBookmark */ = 637FAC760DC495B900D1D35F /* PBXTextBookmark */;
|
||||
63DCCB0C0DC49C00005D833C /* PBXBookmark */ = 63DCCB0C0DC49C00005D833C /* PBXBookmark */;
|
||||
63DCCB0F0DC49C84005D833C /* PBXTextBookmark */ = 63DCCB0F0DC49C84005D833C /* PBXTextBookmark */;
|
||||
63DCCB100DC49C84005D833C /* PBXTextBookmark */ = 63DCCB100DC49C84005D833C /* PBXTextBookmark */;
|
||||
63EFCCEB0DC49BA00031F8B4 /* PBXTextBookmark */ = 63EFCCEB0DC49BA00031F8B4 /* PBXTextBookmark */;
|
||||
};
|
||||
sourceControlManager = 63F91F960DC48F810056EA77 /* Source Control */;
|
||||
|
|
@ -85,7 +87,21 @@
|
|||
637FAC690DC4958E00D1D35F /* all */ = {
|
||||
activeExec = 0;
|
||||
};
|
||||
637FAC760DC495B900D1D35F /* PBXTextBookmark */ = {
|
||||
63DCCB0C0DC49C00005D833C /* PBXBookmark */ = {
|
||||
isa = PBXBookmark;
|
||||
fRef = 63F920CB0DC48FFC0056EA77 /* filevault.c */;
|
||||
};
|
||||
63DCCB0F0DC49C84005D833C /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 63F920CB0DC48FFC0056EA77 /* filevault.c */;
|
||||
name = "filevault.c: 57";
|
||||
rLen = 0;
|
||||
rLoc = 1569;
|
||||
rType = 0;
|
||||
vrLen = 1579;
|
||||
vrLoc = 2111;
|
||||
};
|
||||
63DCCB100DC49C84005D833C /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
fRef = 63F920D20DC48FFC0056EA77 /* zconf.h */;
|
||||
name = "zconf.h: 293";
|
||||
|
|
@ -93,7 +109,7 @@
|
|||
rLoc = 8494;
|
||||
rType = 0;
|
||||
vrLen = 1270;
|
||||
vrLoc = 7655;
|
||||
vrLoc = 7662;
|
||||
};
|
||||
63EFCCEB0DC49BA00031F8B4 /* PBXTextBookmark */ = {
|
||||
isa = PBXTextBookmark;
|
||||
|
|
@ -132,9 +148,9 @@
|
|||
};
|
||||
63F920CB0DC48FFC0056EA77 /* filevault.c */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {987, 3626}}";
|
||||
sepNavSelRange = "{195, 0}";
|
||||
sepNavVisRange = "{938, 475}";
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1091, 3570}}";
|
||||
sepNavSelRange = "{1569, 0}";
|
||||
sepNavVisRange = "{2111, 1579}";
|
||||
sepNavWindowFrame = "{{15, 164}, {1150, 833}}";
|
||||
};
|
||||
};
|
||||
|
|
@ -148,9 +164,9 @@
|
|||
};
|
||||
63F920D20DC48FFC0056EA77 /* zconf.h */ = {
|
||||
uiCtxt = {
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1091, 4872}}";
|
||||
sepNavIntBoundsRect = "{{0, 0}, {1091, 4648}}";
|
||||
sepNavSelRange = "{8494, 0}";
|
||||
sepNavVisRange = "{7655, 1277}";
|
||||
sepNavVisRange = "{7662, 1270}";
|
||||
sepNavWindowFrame = "{{15, 164}, {1150, 833}}";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче