diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 16:22:26 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 16:22:26 +0100 |
| commit | 7c8ced94c32131f24d469d2899f3339f77c47aa1 (patch) | |
| tree | 7dad16d42ed83f3d03917fc25d46fefa4647a2cc /crypto/crypto.h | |
| parent | Include thread ID code in fips module. (diff) | |
| download | openssl-7c8ced94c32131f24d469d2899f3339f77c47aa1.tar.xz openssl-7c8ced94c32131f24d469d2899f3339f77c47aa1.zip | |
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 'crypto/crypto.h')
| -rw-r--r-- | crypto/crypto.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h index 84d3520ec2..5089c65882 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -249,10 +249,6 @@ typedef struct openssl_item_st #define CRYPTO_add(a,b,c) ((*(a))+=(b)) #endif -#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSEVP) -#define CRYPTO_lock FIPS_lock -#endif - /* Some applications as well as some parts of OpenSSL need to allocate and deallocate locks in a dynamic fashion. The following typedef makes this possible in a type-safe manner. */ |