Skip to content

Commit ca227ec

Browse files
committed
Add AppVeyor builds and fix small issues
1 parent c7c7a6e commit ca227ec

File tree

6 files changed

+43
-9
lines changed

6 files changed

+43
-9
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.d
88
*.db
99
*.dat
10+
*.dec
1011
*.dll
1112
*.doc
1213
*.exe

.vs/cdecrypt.vcxproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</PropertyGroup>
105105
<ItemDefinitionGroup Condition="'$(AppVersion)' != ''">
106106
<ClCompile>
107-
<AdditionalOptions>/DGUST_TOOLS_VERSION=$(AppVersion) %(AdditionalOptions)</AdditionalOptions>
107+
<AdditionalOptions>/DAPP_VERSION=$(AppVersion) %(AdditionalOptions)</AdditionalOptions>
108108
</ClCompile>
109109
</ItemDefinitionGroup>
110110
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -123,7 +123,6 @@
123123
<Link>
124124
<SubSystem>Console</SubSystem>
125125
<GenerateDebugInformation>true</GenerateDebugInformation>
126-
<AdditionalLibraryDirectories>C:\Program Files (x86)\OpenSSL-Win32\lib</AdditionalLibraryDirectories>
127126
</Link>
128127
</ItemDefinitionGroup>
129128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -142,7 +141,6 @@
142141
<Link>
143142
<SubSystem>Console</SubSystem>
144143
<GenerateDebugInformation>true</GenerateDebugInformation>
145-
<AdditionalLibraryDirectories>C:\Program Files\OpenSSL-Win64\lib</AdditionalLibraryDirectories>
146144
</Link>
147145
</ItemDefinitionGroup>
148146
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -164,7 +162,6 @@
164162
<EnableCOMDATFolding>true</EnableCOMDATFolding>
165163
<OptimizeReferences>true</OptimizeReferences>
166164
<GenerateDebugInformation>true</GenerateDebugInformation>
167-
<AdditionalLibraryDirectories>C:\Program Files (x86)\OpenSSL-Win32\lib</AdditionalLibraryDirectories>
168165
</Link>
169166
</ItemDefinitionGroup>
170167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -186,7 +183,6 @@
186183
<EnableCOMDATFolding>true</EnableCOMDATFolding>
187184
<OptimizeReferences>true</OptimizeReferences>
188185
<GenerateDebugInformation>true</GenerateDebugInformation>
189-
<AdditionalLibraryDirectories>C:\Program Files\OpenSSL-Win64\lib</AdditionalLibraryDirectories>
190186
</Link>
191187
</ItemDefinitionGroup>
192188
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# cdecrypt
22

3+
[![Build status](https://img.shields.io/appveyor/ci/VitaSmith/cdecrypt.svg?style=flat-square)](https://ci.appveyor.com/project/VitaSmith/cdecrypt)
4+
[![Github stats](https://img.shields.io/github/downloads/VitaSmith/gust_tools/total.svg?style=flat-square)](https://github.com/VitaSmith/gust_tools/releases)
5+
[![Latest release](https://img.shields.io/github/release-pre/VitaSmith/gust_tools?style=flat-square)](https://github.com/VitaSmith/gust_tools/releases)
6+
37
A commandline utility that can be used to decrypt Wii U NUS content files.
48

5-
This is a fork of fork of https://code.google.com/p/cdecrypt intended for modders,
9+
This is a fork of https://code.google.com/p/cdecrypt intended for modders,
610
who want to explore or modify the content of the Wii U applications they own.
11+
12+
Unlike other clones, this version of cdecrypt has **no** external dependencies
13+
such as OpenSSL libraries and whatnot. A single executable file is all you need.

aes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ int aes_setkey_dec(aes_context* ctx, const uint8_t* key, unsigned int keybits)
566566

567567
ctx->nr = cty.nr;
568568

569-
SK = cty.rk + cty.nr * 4;
569+
SK = cty.rk + (uintptr_t)cty.nr * 4;
570570

571571
*RK++ = *SK++;
572572
*RK++ = *SK++;

appveyor.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
image: Visual Studio 2019
2+
3+
skip_non_tags: true
4+
5+
environment:
6+
PROJECT_NAME: cdecrypt
7+
FRIENDLY_NAME: cdecrypt
8+
9+
build_script:
10+
ps: |-
11+
msbuild "$env:PROJECT_NAME.sln" /m /p:Configuration=Release /p:Platform=x86 /p:AppVersion=$env:APPVEYOR_REPO_TAG_NAME /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
12+
13+
after_build:
14+
ps: |-
15+
7z a "$env:PROJECT_NAME.zip" .\x86\Release\*.exe README.md LICENSE.txt
16+
Get-FileHash "$env:PROJECT_NAME.zip" -Algorithm SHA256 | Format-List
17+
18+
artifacts:
19+
- path: $(PROJECT_NAME).zip
20+
name: $(FRIENDLY_NAME)
21+
22+
deploy:
23+
release: $(APPVEYOR_REPO_TAG_NAME)
24+
description: $(FRIENDLY_NAME) $(APPVEYOR_REPO_TAG_NAME)
25+
provider: GitHub
26+
auth_token:
27+
secure: NJtYKU1LEV3Y13rBlM/EU93LwU7di/h2o/Sa0niABhIhFqD5Q2/jjbHYbS45IPhf
28+
artifact: /.*\.zip/
29+
draft: false
30+
prerelease: false

cdecrypt.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static bool ExtractFileHash(FILE* in, uint64_t PartDataOffset, uint64_t FileOffs
263263
goto out;
264264
}
265265

266-
Size -= fwrite(decdata + soffset, sizeof(char), WriteSize, dst);
266+
Size -= fwrite(decdata + soffset, sizeof(char), (size_t)WriteSize, dst);
267267

268268
Wrote += WriteSize;
269269

@@ -328,7 +328,7 @@ static bool ExtractFile(FILE* in, uint64_t PartDataOffset, uint64_t FileOffset,
328328

329329
aes_crypt_cbc(&ctx, AES_DECRYPT, BLOCK_SIZE, IV, (const uint8_t*)(encdata), (uint8_t*)decdata);
330330

331-
Size -= fwrite(decdata + soffset, sizeof(char), WriteSize, dst);
331+
Size -= fwrite(decdata + soffset, sizeof(char), (size_t)WriteSize, dst);
332332

333333
Wrote += WriteSize;
334334

0 commit comments

Comments
 (0)