diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 14:19:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 14:19:19 +0000 |
| commit | 7207eca1ee06ad4b5b5ab7b16e57f5f4f61606dd (patch) | |
| tree | 807dd0dc17677e2ba0a464548ac94096a4ca6933 /crypto/err | |
| parent | 9c34782478f00faba7bac87bd03a0f4f1ee53747 (diff) | |
| download | openssl-new-7207eca1ee06ad4b5b5ab7b16e57f5f4f61606dd.tar.gz | |
The first of many changes to make OpenSSL 1.0.1 FIPS capable.
Add static build support to openssl utility.
Add new "fips" option to Configure.
Make use of installed fipsld and fips_standalone_sha1
Initialise FIPS error callbacks, locking and DRBG.
Doesn't do anything much yet: no crypto is redirected to the FIPS module.
Doesn't completely build either but the openssl utility can enter FIPS mode:
which doesn't do anything much either.
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/err/err.h b/crypto/err/err.h index 974cc9cc6f..3d71e4212e 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -137,6 +137,12 @@ extern "C" { #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) #endif +#ifdef OPENSSL_FIPS +void FIPS_set_error_callbacks( + void (*put_cb)(int lib, int func,int reason,const char *file,int line), + void (*add_cb)(int num, va_list args) ); +#endif + #include <errno.h> #define ERR_TXT_MALLOCED 0x01 |