Skip to content

Commit

Permalink
trim excess whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@a1346054
a1346054 committed Sep 13, 2021
1 parent e664ce5 commit dddf466
Show file tree
Hide file tree
Showing 21 changed files with 17 additions and 59 deletions.
1 change: 0 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,3 @@ me know! Thanks to all the bug reporters as well.
their standard header files.

* Fixed typos

1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,3 @@ include(CPack)
cpack_add_component(bin DISPLAY_NAME bin REQUIRED INSTALL_TYPES all)
cpack_add_component(lib DISPLAY_NAME lib REQUIRED INSTALL_TYPES all)
cpack_add_component(lib-dev DISPLAY_NAME lib-dev REQUIRED INSTALL_TYPES all DEPENDS lib)

1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,3 @@ Some notable differences between actual implementation and documentation:
in the documentation.
- All two-way cipher cascades are the wrong way round in the documentation,
but all three-way cipher cascades are correct.

1 change: 0 additions & 1 deletion crypto-dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,3 @@ tc_crypto_init(void)

return 0;
}

1 change: 0 additions & 1 deletion generic_xts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,3 @@ xts_uninit(struct xts_ctx *ctx)

return 0;
}

1 change: 0 additions & 1 deletion generic_xts.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,3 @@ int xts_init(struct xts_ctx *ctxp, void *arg1, void *arg2, set_key_fn set_key_fn
int xts_encrypt(struct xts_ctx *ctx, uint8_t *data, size_t len, uint8_t *iv);
int xts_decrypt(struct xts_ctx *ctx, uint8_t *data, size_t len, uint8_t *iv);
int xts_uninit(struct xts_ctx *ctxp);

1 change: 0 additions & 1 deletion humanize.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@

int _humanize_number(char *buf, size_t bufsz, uint64_t num);
int _dehumanize_number(const char *buf, uint64_t *dest);

4 changes: 2 additions & 2 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ static struct option longopts[] = {
{ "weak-keys", no_argument, NULL, 'w' },
{ "insecure-erase", no_argument, NULL, 'z' },
{ "help", no_argument, NULL, 'h' },
{ "no-retries", no_argument, NULL, FLAG_LONG_NO_RETRIES },
{ NULL, 0, NULL, 0 },
{ "no-retries", no_argument, NULL, FLAG_LONG_NO_RETRIES },
{ NULL, 0, NULL, 0 },
};

#define _set_str_opt(opt) \
Expand Down
1 change: 0 additions & 1 deletion pbkdf2-gcrypt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,3 @@ pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,

return 0;
}

1 change: 0 additions & 1 deletion pbkdf2-openssl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,3 @@ pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,

return 0;
}

6 changes: 3 additions & 3 deletions tcplay.3
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.\"
.\" Copyright (c) 2011 The DragonFly Project. All rights reserved.
.\"
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\"
.\"
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
Expand All @@ -14,7 +14,7 @@
.\" 3. Neither the name of The DragonFly Project nor the names of its
.\" contributors may be used to endorse or promote products derived
.\" from this software without specific, prior written permission.
.\"
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
Expand Down
1 change: 0 additions & 1 deletion tcplay_api_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ main(void)

return 0;
}

4 changes: 2 additions & 2 deletions test/features/step_definitions/libtcplay_steps.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@

r = TCplayLib.tc_api_task_info_get(task, "iv_offset", :size_t, 8, :pointer, buf)
r.should == TCplayLib::TC_OK
@info['iv offset'] = "#{buf.get_int64(0)} bytes"
@info['iv offset'] = "#{buf.get_int64(0)} bytes"

r = TCplayLib.tc_api_task_info_get(task, "block_offset", :size_t, 8, :pointer, buf)
r.should == TCplayLib::TC_OK
Expand Down Expand Up @@ -262,7 +262,7 @@

r = TCplayLib.tc_api_task_info_get(task, "iv_offset", :size_t, 8, :pointer, buf)
r.should == TCplayLib::TC_OK
@info['iv offset'] = "#{buf.get_int64(0)} bytes"
@info['iv offset'] = "#{buf.get_int64(0)} bytes"

r = TCplayLib.tc_api_task_info_get(task, "block_offset", :size_t, 8, :pointer, buf)
r.should == TCplayLib::TC_OK
Expand Down
3 changes: 1 addition & 2 deletions test/features/step_definitions/tcplay_steps.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
@args << "-b #{s['cipher'].strip}" unless s['cipher'].nil?
@args << "-x #{s['pbkdf_prf_hidden'].strip}" unless s['pbkdf_prf_hidden'].nil?
@args << "-y #{s['cipher_hidden'].strip}" unless s['cipher_hidden'].nil?

s['passphrase'] ||= ''
s['passphrase_hidden'] ||= ''

Expand Down Expand Up @@ -377,4 +377,3 @@

@files_to_delete.each { |f| File.unlink(f) }
end

1 change: 0 additions & 1 deletion test/features/support/env.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,3 @@ def detach_all
end
end
end

1 change: 0 additions & 1 deletion test/features/veracrypt_cli.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Feature: Command line info/map using VeraCrypt volumes
| IV offset | 256 sectors |
| Block offset | 256 sectors |


Scenario: Info about volume test_sha256.vc
Given I request information about volume test_sha256.vc using the following settings:
| passphrase | testtest |
Expand Down
13 changes: 1 addition & 12 deletions test/features/vol_test1_api.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Feature: API mapping/info tests using volume test1.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Map hidden volume
Given I map volume test1.tc as tcplay_test with the API using the following settings:
| passphrase | hidden |
Expand All @@ -31,8 +29,6 @@ Feature: API mapping/info tests using volume test1.tc
| IV offset | 15597568 bytes |
| Block offset | 15597568 bytes |



Scenario: Map outer volume protecting hidden volume
Given I map volume test1.tc as tcplay_test with the API using the following settings:
| passphrase | test |
Expand All @@ -49,9 +45,7 @@ Feature: API mapping/info tests using volume test1.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Info on outer volume
Scenario: Info on outer volume
Given I request information about volume test1.tc with the API using the following settings:
| passphrase | test |
Then I expect tcplay to report the following:
Expand All @@ -62,8 +56,6 @@ Feature: API mapping/info tests using volume test1.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Info on hidden volume
Given I request information about volume test1.tc with the API using the following settings:
| passphrase | hidden |
Expand All @@ -75,8 +67,6 @@ Feature: API mapping/info tests using volume test1.tc
| IV offset | 15597568 bytes |
| Block offset | 15597568 bytes |



Scenario: Info on outer volume protecting hidden volume
Given I request information about volume test1.tc with the API using the following settings:
| passphrase | test |
Expand All @@ -89,4 +79,3 @@ Feature: API mapping/info tests using volume test1.tc
| Volume size | 15466496 bytes |
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |

4 changes: 0 additions & 4 deletions test/features/vol_test1_cli.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Feature: Command line mapping/info tests using volume test1.tc
| IV offset | 256 sectors |
| Block offset | 256 sectors |



Scenario: Map hidden volume
Given I map volume test1.tc as tcplay_test using the following settings:
| passphrase | hidden |
Expand All @@ -31,8 +29,6 @@ Feature: Command line mapping/info tests using volume test1.tc
| IV offset | 30464 sectors |
| Block offset | 30464 sectors |



Scenario: Map outer volume protecting hidden volume
Given I map volume test1.tc as tcplay_test using the following settings:
| passphrase | test |
Expand Down
10 changes: 0 additions & 10 deletions test/features/vol_test2_api.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Feature: API mapping/info tests using volume test2.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Map hidden volume
Given I map volume test2.tc as tcplay_test with the API using the following settings:
| passphrase | hidden |
Expand All @@ -35,8 +33,6 @@ Feature: API mapping/info tests using volume test2.tc
| IV offset | 4063232 bytes |
| Block offset | 4063232 bytes |



Scenario: Map outer volume protecting hidden volume
Given I map volume test2.tc as tcplay_test with the API using the following settings:
| passphrase | test |
Expand All @@ -56,8 +52,6 @@ Feature: API mapping/info tests using volume test2.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Info on outer volume
Given I request information about volume test2.tc with the API using the following settings:
| passphrase | test |
Expand All @@ -69,8 +63,6 @@ Feature: API mapping/info tests using volume test2.tc
| IV offset | 131072 bytes |
| Block offset | 131072 bytes |



Scenario: Map hidden volume
Given I request information about volume test2.tc with the API using the following settings:
| passphrase | hidden |
Expand All @@ -83,8 +75,6 @@ Feature: API mapping/info tests using volume test2.tc
| IV offset | 4063232 bytes |
| Block offset | 4063232 bytes |



Scenario: Map outer volume protecting hidden volume
Given I request information about volume test2.tc with the API using the following settings:
| passphrase | test |
Expand Down
4 changes: 0 additions & 4 deletions test/features/vol_test2_cli.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Feature: Command line mapping/info tests using volume test2.tc
| IV offset | 256 sectors |
| Block offset | 256 sectors |



Scenario: Map hidden volume in test2.tc
Given I map volume test2.tc as tcplay_test using the following settings:
| passphrase | hidden |
Expand All @@ -35,8 +33,6 @@ Feature: Command line mapping/info tests using volume test2.tc
| IV offset | 7936 sectors |
| Block offset | 7936 sectors |



Scenario: Map outer volume protecting hidden volume in test2.tc
Given I map volume test2.tc as tcplay_test using the following settings:
| passphrase | test |
Expand Down
16 changes: 8 additions & 8 deletions test/volumes/test2.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ Filesystem:
5) Linux Ext4
Select [2]: 1

Enter password:
Enter password:
WARNING: Short passwords are easy to crack using brute force techniques!

We recommend choosing a password consisting of more than 20 characters. Are you sure you want to use a short password? (y=Yes/n=No) [No]: y

Re-enter password:
Re-enter password:

Enter keyfile path [none]:
Enter keyfile path [none]:

Please type at least 320 randomly chosen characters and then press Enter:
Characters remaining: 172
Characters remaining: 33


Done: 100.000% Speed: 11 MB/s Left: 0 s
Done: 100.000% Speed: 11 MB/s Left: 0 s

The TrueCrypt volume has been successfully created.
21:21:29 alex-laptop:~/src/truecrypt-7.1a-source
21:21:29 alex-laptop:~/src/truecrypt-7.1a-source
% Main/truecrypt -t -c
Volume type:
1) Normal
Expand Down Expand Up @@ -88,16 +88,16 @@ Filesystem:
5) Linux Ext4
Select [2]: 1

Enter password:
Enter password:
WARNING: Short passwords are easy to crack using brute force techniques!

We recommend choosing a password consisting of more than 20 characters. Are you sure you want to use a short password? (y=Yes/n=No) [No]: yes

Re-enter password:
Re-enter password:

Enter keyfile path [none]: /home/alex/src/tc-play/test/key.1
Enter keyfile path [finish]: /home/alex/src/tc-play/test/key.2
Enter keyfile path [finish]:
Enter keyfile path [finish]:



Expand Down

0 comments on commit dddf466

Please sign in to comment.