Skip to content

Commit ae34fb2

Browse files
authored
Merge pull request #17 from johnkellyoxford/master
Travis CI test
2 parents 8958458 + 4ea8f1c commit ae34fb2

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
language: csharp
2+
solution: EncryptionApp.sln
File renamed without changes.

docs/HeaderSpec.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
## Header items
2626

27-
| Argument | Meaning | Values|
28-
| ------------- |-------------| ----- |
29-
| <a href="#HMAC">HMAC</a> | The verification hash used to confirm the file hasn't changed | 128 - 512 bit byte array (16-64 bytes) |
27+
| Argument | Meaning | Values|
28+
| ------------------------------------------------------ |-------------------------------- | ------------------------------------ |
29+
| <a href="#HMAC">HMAC</a> | The verification hash used to confirm the file hasn't changed | 128 - 512 bit byte array (16-64 bytes) |
3030
| <a href="#KEYVERIFICATIONHASH">KEYVERIFICATIONHASH</a> | A hash of the key to verify if the password is correct | 128 - 512 bit byte array (16-64 bytes) |
31-
| <a href="#ENCRYPTMODE">ENCRYPTMODE</a> | A byte representing the encryption type | A string in the table of <a href="#ENCRYPTMODE">ENCRYPTMODE</a> page, and the (undefined ATM -- TODO) enumeration |
31+
| <a href="#ENCRYPTMODE">ENCRYPTMODE</a> | A byte representing the encryption type | A string in the table of <a href="#ENCRYPTMODE">ENCRYPTMODE</a> page, and the (undefined ATM -- TODO) enumeration |
3232

3333
### <p id="HMAC">HMAC</p>
3434

src/EncryptionApp.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
<SubType>Designer</SubType>
6161
</Page>
6262
<Compile Include="Backend\AESCryptoManager.cs" />
63-
<Compile Include="Backend\Encryptor.cs" />
64-
<Compile Include="UI\App.xaml.cs">
63+
<Compile Include="UI\App.xaml.cs" >
6564
<DependentUpon>App.xaml</DependentUpon>
6665
<SubType>Code</SubType>
6766
</Compile>
@@ -98,4 +97,4 @@
9897
</ItemGroup>
9998
<ItemGroup />
10099
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
101-
</Project>
100+
</Project>

0 commit comments

Comments
 (0)