Skip to content

Commit 98415b8

Browse files
sjaeckelsjaeckel
committed
Change ltcrypt back to crypt
This reverts 85dc394 Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent 9eef89c commit 98415b8

8 files changed

+21
-21
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ aesgcm
2626
aesgcm.exe
2727
constants
2828
constants.exe
29-
ltcrypt
30-
ltcrypt.exe
29+
crypt
30+
crypt.exe
3131
hashsum
3232
hashsum.exe
3333
multi

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ The following list does not claim to be complete resp. to be available across al
100100
| *empty target*/none given | c.f. `library`
101101
| `library` | builds only the library |
102102
| `hashsum` | builds the `hashsum` binary, similar to [`shasum`](https://linux.die.net/man/1/shasum), but with support for all hash-algorithms included in the library *\*4* |
103-
| `ltcrypt` | builds the `ltcrypt` binary, implementing something similar to [`crypt`](https://linux.die.net/man/3/crypt) *\*4* |
103+
| `crypt` | builds the `crypt` binary, implementing something similar to [`crypt`](https://linux.die.net/man/3/crypt) *\*4* |
104104
| `sizes` | builds the `sizes` binary, printing all internal data sizes on invocation *\*4* |
105105
| `constants` | builds the `constants` binary, printing all internal constants on invocation *\*4* |
106106
| `openssl-enc` | builds the `openssl-enc` binary, which is more or less compatible to [`openssl enc`](https://linux.die.net/man/1/enc) *\*4* *\*5* |
107107
| `test` | builds the `test` binary, which runs all algorithm self-tests + some extended tests *\*4* |
108108
| `timing` | builds the `timing` binary, which can be used to measure timings for algorithms and modes *\*4* |
109109
| `bins` | builds `hashsum` *\*4* |
110-
| `all_test` | builds `test`, `hashsum`, `ltcrypt`, `small`, `tv_gen`, `sizes` & `constants` *\*4* |
110+
| `all_test` | builds `test`, `hashsum`, `crypt`, `small`, `tv_gen`, `sizes` & `constants` *\*4* |
111111
| `docs` | builds the developer documentation `doc/crypt.pdf` |
112112
| `install` | installs the `library` and header files *\*7* *\*8* |
113113
| `install_bins` | installs the binaries created by the `bins` target *\*7* *\*8* |

‎demos/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Options
33
#-----------------------------------------------------------------------------
44
option(BUILD_USEFUL_DEMOS "Build useful demos (hashsum)" FALSE)
5-
option(BUILD_USABLE_DEMOS "Build usable demos (ltcrypt sizes constants pem-info)" FALSE)
5+
option(BUILD_USABLE_DEMOS "Build usable demos (crypt sizes constants pem-info)" FALSE)
66
option(BUILD_TEST_DEMOS "Build test demos (small tv_gen)" FALSE)
77

88
#-----------------------------------------------------------------------------
@@ -30,14 +30,14 @@ endif()
3030

3131
if(BUILD_USABLE_DEMOS)
3232

33-
list(APPEND ALL_DEMOS_TARGETS ltcrypt sizes constants pem-info)
33+
list(APPEND ALL_DEMOS_TARGETS crypt sizes constants pem-info)
3434

3535
# ltcrypt
36-
add_executable(ltcrypt
37-
${CMAKE_CURRENT_SOURCE_DIR}/ltcrypt.c
36+
add_executable(crypt
37+
${CMAKE_CURRENT_SOURCE_DIR}/crypt.c
3838
)
3939

40-
target_link_libraries(ltcrypt PRIVATE
40+
target_link_libraries(crypt PRIVATE
4141
${PROJECT_NAME}
4242
)
4343

‎demos/ltcrypt.c renamed to ‎demos/crypt.c

File renamed without changes.

‎makefile.mingw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ $(LIBMAIN_D) $(LIBMAIN_I): $(OBJECTS)
284284
#Demo tools/utilities
285285
hashsum.exe: demos/hashsum.o $(LIBMAIN_S)
286286
$(CC) demos/hashsum.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
287-
ltcrypt.exe: demos/ltcrypt.o $(LIBMAIN_S)
288-
$(CC) demos/ltcrypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
287+
crypt.exe: demos/crypt.o $(LIBMAIN_S)
288+
$(CC) demos/crypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
289289
small.exe: demos/small.o $(LIBMAIN_S)
290290
$(CC) demos/small.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
291291
tv_gen.exe: demos/tv_gen.o $(LIBMAIN_S)
@@ -302,7 +302,7 @@ test.exe: $(TOBJECTS) $(LIBMAIN_S)
302302
$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
303303
@echo NOTICE: start the tests by launching test.exe
304304

305-
all: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D) hashsum.exe ltcrypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
305+
all: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D) hashsum.exe crypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
306306

307307
test: test.exe
308308

‎makefile.msvc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ $(LIBMAIN_S): $(OBJECTS)
271271
#Demo tools/utilities
272272
hashsum.exe: demos/hashsum.c tests/common.c $(LIBMAIN_S)
273273
cl $(LTC_CFLAGS) demos/hashsum.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
274-
ltcrypt.exe: demos/ltcrypt.c $(LIBMAIN_S)
275-
cl $(LTC_CFLAGS) demos/ltcrypt.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
274+
crypt.exe: demos/crypt.c $(LIBMAIN_S)
275+
cl $(LTC_CFLAGS) demos/crypt.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
276276
small.exe: demos/small.c $(LIBMAIN_S)
277277
cl $(LTC_CFLAGS) demos/small.c tests/common.c $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
278278
tv_gen.exe: demos/tv_gen.c $(LIBMAIN_S)
@@ -289,7 +289,7 @@ test.exe: $(LIBMAIN_S) $(TOBJECTS)
289289
cl $(LTC_CFLAGS) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) /Fe$@
290290
@echo NOTICE: start the tests by launching test.exe
291291

292-
all: $(LIBMAIN_S) hashsum.exe ltcrypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
292+
all: $(LIBMAIN_S) hashsum.exe crypt.exe small.exe tv_gen.exe sizes.exe constants.exe timing.exe test.exe
293293

294294
test: test.exe
295295

‎makefile.unix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ $(LIBMAIN_S): $(OBJECTS)
295295
#Demo tools/utilities
296296
hashsum: demos/hashsum.o $(LIBMAIN_S)
297297
$(CC) demos/hashsum.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
298-
ltcrypt: demos/ltcrypt.o $(LIBMAIN_S)
299-
$(CC) demos/ltcrypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
298+
crypt: demos/crypt.o $(LIBMAIN_S)
299+
$(CC) demos/crypt.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
300300
small: demos/small.o $(LIBMAIN_S)
301301
$(CC) demos/small.o $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
302302
tv_gen: demos/tv_gen.o $(LIBMAIN_S)
@@ -313,15 +313,15 @@ test: $(TOBJECTS) $(LIBMAIN_S)
313313
$(CC) $(TOBJECTS) $(LIBMAIN_S) $(LTC_LDFLAGS) -o $@
314314
@echo "NOTICE: start the tests by: ./test"
315315

316-
all: $(LIBMAIN_S) hashsum ltcrypt small tv_gen sizes constants timing test
316+
all: $(LIBMAIN_S) hashsum crypt small tv_gen sizes constants timing test
317317

318318
#NOTE: this makefile works also on cygwin, thus we need to delete *.exe
319319
clean:
320320
-@rm -f $(OBJECTS) $(TOBJECTS)
321321
-@rm -f $(LIBMAIN_S)
322322
-@rm -f demos/*.o *_tv.txt
323-
-@rm -f test constants sizes tv_gen hashsum ltcrypt small timing
324-
-@rm -f test.exe constants.exe sizes.exe tv_gen.exe hashsum.exe ltcrypt.exe small.exe timing.exe
323+
-@rm -f test constants sizes tv_gen hashsum crypt small timing
324+
-@rm -f test.exe constants.exe sizes.exe tv_gen.exe hashsum.exe crypt.exe small.exe timing.exe
325325

326326
#Install the library + headers
327327
install: $(LIBMAIN_S)

‎makefile_include.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ TEST=test
168168
USEFUL_DEMOS = hashsum
169169

170170
# Demos that are usable but only rarely make sense to be installed
171-
USEABLE_DEMOS = ltcrypt sizes constants pem-info
171+
USEABLE_DEMOS = crypt sizes constants pem-info
172172

173173
# Demos that are used for testing or measuring
174174
TEST_DEMOS = small tv_gen

0 commit comments

Comments
 (0)