diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 15:22:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 15:22:26 +0000 |
| commit | 7c8ced94c32131f24d469d2899f3339f77c47aa1 (patch) | |
| tree | 7dad16d42ed83f3d03917fc25d46fefa4647a2cc /fips/fips.h | |
| parent | d5df1b3f0db030c2202cbcc7c0ca9921d3db2ce0 (diff) | |
| download | openssl-7c8ced94c32131f24d469d2899f3339f77c47aa1.zip openssl-7c8ced94c32131f24d469d2899f3339f77c47aa1.tar.gz openssl-7c8ced94c32131f24d469d2899f3339f77c47aa1.tar.bz2 | |
Change OPENSSL_FIPSEVP to OPENSSL_FIPSAPI as it doesn't just refer
to EVP any more.
Move locking #define into fips.h.
Set FIPS locking callbacks at same time as OpenSSL locking callbacks.
Diffstat (limited to 'fips/fips.h')
| -rw-r--r-- | fips/fips.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fips/fips.h b/fips/fips.h index 061ed93..96d8ff6 100644 --- a/fips/fips.h +++ b/fips/fips.h @@ -122,6 +122,10 @@ int FIPS_evp_md_ctx_cleanup(EVP_MD_CTX *ctx); void FIPS_set_locking_callback (void (*func)(int mode, int type, const char *file,int line)); +#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI) +#define CRYPTO_lock FIPS_lock +#endif + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. |