diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-03-12 14:48:19 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-03-13 08:29:54 +0100 |
| commit | 1f246c381e8a7449d84b143ffe50a0818622d2a3 (patch) | |
| tree | 9f753dd6e32a678aef01247fbc3168930542b966 /tests/slow | |
| parent | 96476f5da225b46d3ab17eb3494ae4a24cca9525 (diff) | |
| download | gnutls-1f246c381e8a7449d84b143ffe50a0818622d2a3.tar.gz | |
lib: unconditionally enable the self-check functionstmp-pkcs11-avoid-locks
These functions were previously made available only in FIPS140-2
mode. Enabling them unconditionally allows applications to directly
utilize that functionality for testing the gnutls library.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'tests/slow')
| -rw-r--r-- | tests/slow/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/slow/cipher-override.c | 5 | ||||
| -rw-r--r-- | tests/slow/cipher-override2.c | 5 | ||||
| -rw-r--r-- | tests/slow/cipher-test.c | 6 | ||||
| -rw-r--r-- | tests/slow/mac-override.c | 5 |
5 files changed, 0 insertions, 26 deletions
diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am index 7c9fc543cf..8f9c4e4db6 100644 --- a/tests/slow/Makefile.am +++ b/tests/slow/Makefile.am @@ -34,13 +34,8 @@ LDADD = ../libutils.la \ ../../gl/libgnu.la \ $(top_builddir)/lib/libgnutls.la $(LIBSOCKET) -if !ENABLE_SELF_CHECKS -cipher_test_CPPFLAGS = $(AM_CPPFLAGS) $(NETTLE_CFLAGS) -I$(top_builddir)/lib/ -cipher_override2_CPPFLAGS = $(AM_CPPFLAGS) $(NETTLE_CFLAGS) -I$(top_builddir)/lib/ -else cipher_test_CPPFLAGS = $(AM_CPPFLAGS) cipher_override2_CPPFLAGS = $(AM_CPPFLAGS) -endif ctests = gendh diff --git a/tests/slow/cipher-override.c b/tests/slow/cipher-override.c index fd5d0c990b..539a49fcdc 100644 --- a/tests/slow/cipher-override.c +++ b/tests/slow/cipher-override.c @@ -28,11 +28,6 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "<%d>| %s", level, str); } -#ifndef ENABLE_SELF_CHECKS -# define AVOID_INTERNALS -# include "../../lib/crypto-selftests.c" -#endif - struct myaes_ctx { struct aes_ctx aes; unsigned char iv[16]; diff --git a/tests/slow/cipher-override2.c b/tests/slow/cipher-override2.c index c7c2842eee..85c0b70417 100644 --- a/tests/slow/cipher-override2.c +++ b/tests/slow/cipher-override2.c @@ -16,11 +16,6 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "<%d>| %s", level, str); } -#ifndef ENABLE_SELF_CHECKS -# define AVOID_INTERNALS -# include "../../lib/crypto-selftests.c" -#endif - struct myaes_ctx { unsigned char iv[16]; }; diff --git a/tests/slow/cipher-test.c b/tests/slow/cipher-test.c index 6b66e678c9..da7e7e7673 100644 --- a/tests/slow/cipher-test.c +++ b/tests/slow/cipher-test.c @@ -32,12 +32,6 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "<%d>| %s", level, str); } -#ifndef ENABLE_SELF_CHECKS -# define AVOID_INTERNALS -# include "../../lib/crypto-selftests.c" -# include "../../lib/crypto-selftests-pk.c" -#endif - int main(int argc, char **argv) { gnutls_global_set_log_function(tls_log_func); diff --git a/tests/slow/mac-override.c b/tests/slow/mac-override.c index a2917bd946..1ef994217d 100644 --- a/tests/slow/mac-override.c +++ b/tests/slow/mac-override.c @@ -29,11 +29,6 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "<%d>| %s", level, str); } -#ifndef ENABLE_SELF_CHECKS -# define AVOID_INTERNALS -# include "../../lib/crypto-selftests.c" -#endif - struct myhash_ctx { struct sha1_ctx sha1; }; |