Skip to content

Commit

Permalink
Remove the sample program aescrypt2
Browse files Browse the repository at this point in the history
The sample program aescrypt2 shows bad practice: hand-rolled CBC
implementation, CBC+HMAC for AEAD, hand-rolled iterated SHA-2 for key
stretching, no algorithm agility. The new sample program pbcrypt does
the same thing, but better. So remove aescrypt2.

Fix Mbed-TLS#1906
  • Loading branch information
gilles-peskine-arm committed Feb 26, 2019
1 parent d5f6663 commit 1d965b4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 477 deletions.
1 change: 0 additions & 1 deletion programs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
*.sln
*.vcxproj

aes/aescrypt2
aes/crypt_and_hash
cipher/pbcrypt
hash/generic_sum
Expand Down
6 changes: 1 addition & 5 deletions programs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ifdef ZLIB
LOCAL_LDFLAGS += -lz
endif

APPS = aes/aescrypt2$(EXEXT) aes/crypt_and_hash$(EXEXT) \
APPS = aes/crypt_and_hash$(EXEXT) \
cipher/pbcrypt$(EXEXT) \
hash/hello$(EXEXT) hash/generic_sum$(EXEXT) \
pkey/dh_client$(EXEXT) \
Expand Down Expand Up @@ -86,10 +86,6 @@ all: $(APPS)
$(DEP):
$(MAKE) -C ../library

aes/aescrypt2$(EXEXT): aes/aescrypt2.c $(DEP)
echo " CC aes/aescrypt2.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) aes/aescrypt2.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@

aes/crypt_and_hash$(EXEXT): aes/crypt_and_hash.c $(DEP)
echo " CC aes/crypt_and_hash.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) aes/crypt_and_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
Expand Down
5 changes: 1 addition & 4 deletions programs/aes/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
add_executable(aescrypt2 aescrypt2.c)
target_link_libraries(aescrypt2 mbedtls)

add_executable(crypt_and_hash crypt_and_hash.c)
target_link_libraries(crypt_and_hash mbedtls)

install(TARGETS aescrypt2 crypt_and_hash
install(TARGETS crypt_and_hash
DESTINATION "bin"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
Loading

0 comments on commit 1d965b4

Please sign in to comment.