diff options
author | Hans Nilsson <[email protected]> | 2019-02-27 15:05:31 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2019-02-27 15:05:31 +0100 |
commit | b0f099c8a7eb47ee2b894f58b8e71bb28c512be8 (patch) | |
tree | afce2f563788fe0d8ed2ed7c10e674d484264a6c /lib/crypto/test/Makefile | |
parent | 0c3014ec38ef6adbe9369afe7c440b547fa321a1 (diff) | |
parent | 2337695557f4d7f0993c705543bb4a63ad61961b (diff) | |
download | otp-b0f099c8a7eb47ee2b894f58b8e71bb28c512be8.tar.gz otp-b0f099c8a7eb47ee2b894f58b8e71bb28c512be8.tar.bz2 otp-b0f099c8a7eb47ee2b894f58b8e71bb28c512be8.zip |
Merge branch 'maint'
* maint:
crypto: Remove assertion
crypto: Fail if FIPS mode is present but can't be enabled
crypto: Remove blowfish_SUITE.
crypto: Update crypto_SUITE checking of FIPS
Diffstat (limited to 'lib/crypto/test/Makefile')
-rw-r--r-- | lib/crypto/test/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile index 8b320e01a9..988d95a8bc 100644 --- a/lib/crypto/test/Makefile +++ b/lib/crypto/test/Makefile @@ -7,7 +7,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk MODULES = \ crypto_bench_SUITE \ - blowfish_SUITE \ crypto_SUITE \ engine_SUITE |