diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2013-12-04 15:48:49 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2013-12-04 15:48:49 +0100 |
| commit | 4123494385f4c0916923a870c8a69cf664e99df4 (patch) | |
| tree | c9d226e3fe255a61f3bf99a832979e66c82987c8 /lib/gnutls_global.c | |
| parent | d0b75ec928a2eb1a9d5b10ec2d0127111544c7a1 (diff) | |
| download | gnutls-4123494385f4c0916923a870c8a69cf664e99df4.tar.gz | |
removed zombie mode, and no longer use fips140.h
Diffstat (limited to 'lib/gnutls_global.c')
| -rw-r--r-- | lib/gnutls_global.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c index e499990cf9..5a4b2eea83 100644 --- a/lib/gnutls_global.c +++ b/lib/gnutls_global.c @@ -321,9 +321,13 @@ int gnutls_global_init2(unsigned int flags) * have been loaded */ if (flags & GNUTLS_GLOBAL_INIT_MINIMAL) { res = _gnutls_fips_mode_enabled(); + /* res == 1 -> fips140-2 mode enabled + * res == 2 -> only self checks performed - but no failure + * res == not in fips140 mode + */ if (res != 0) { ret = _gnutls_fips_perform_self_checks(); - if (_gnutls_get_lib_state() != LIB_STATE_ZOMBIE) { + if (res != 2) { if (ret < 0) { gnutls_assert(); goto out; |