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/fips.h | |
| parent | d0b75ec928a2eb1a9d5b10ec2d0127111544c7a1 (diff) | |
| download | gnutls-4123494385f4c0916923a870c8a69cf664e99df4.tar.gz | |
removed zombie mode, and no longer use fips140.h
Diffstat (limited to 'lib/fips.h')
| -rw-r--r-- | lib/fips.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/fips.h b/lib/fips.h index 95f28ad251..6b48be4a5a 100644 --- a/lib/fips.h +++ b/lib/fips.h @@ -30,7 +30,6 @@ typedef enum { LIB_STATE_POWERON, - LIB_STATE_ZOMBIE, LIB_STATE_INIT, LIB_STATE_SELFTEST, LIB_STATE_OPERATIONAL, @@ -45,8 +44,7 @@ inline static void _gnutls_switch_lib_state(gnutls_lib_state_t state) { /* Once into zombie state no errors can change us */ - if (_gnutls_lib_mode != LIB_STATE_ZOMBIE) - _gnutls_lib_mode = state; + _gnutls_lib_mode = state; } inline static gnutls_lib_state_t _gnutls_get_lib_state(void) @@ -59,8 +57,8 @@ unsigned _gnutls_fips_mode_enabled(void); # define FAIL_IF_LIB_ERROR \ if (_gnutls_get_lib_state() != LIB_STATE_OPERATIONAL && \ - _gnutls_get_lib_state() != LIB_STATE_SELFTEST && \ - _gnutls_get_lib_state() != LIB_STATE_ZOMBIE) return GNUTLS_E_LIB_IN_ERROR_STATE + _gnutls_get_lib_state() != LIB_STATE_SELFTEST) \ + return GNUTLS_E_LIB_IN_ERROR_STATE void _gnutls_switch_lib_state(gnutls_lib_state_t state); |