summaryrefslogtreecommitdiffstats
path: root/crypto/o_init.c
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2016-09-26 14:23:29 +0200
committerMatt Caswell <matt@openssl.org>2017-12-08 09:46:21 +0000
commit18df0adda98f8f21cc494b4835c2817bcadbeb8a (patch)
treebc7360cffaf12b62dc320a257fdd0cb80a6e1caf /crypto/o_init.c
parent6957d91f0eed10859dff26311592b326a07a1d73 (diff)
Add missing prototype for FIPS callback
Fixes #2533 The call to FIPS_crypto_set_id_callback() was added in revision a43cfd7bb1fc681d563e, but there is no prototype for it in <openssl/fips.h>. Signed-off-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4870)
Diffstat (limited to 'crypto/o_init.c')
-rw-r--r--crypto/o_init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/o_init.c b/crypto/o_init.c
index 185841ea04..18bb85894d 100644
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -58,6 +58,11 @@
#ifdef OPENSSL_FIPS
# include <openssl/fips.h>
# include <openssl/rand.h>
+
+# ifndef OPENSSL_NO_DEPRECATED
+/* the prototype is missing in <openssl/fips.h> */
+void FIPS_crypto_set_id_callback(unsigned long (*func)(void));
+# endif
#endif
/*