Add missing prototype for FIPS callback
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Mon, 26 Sep 2016 12:23:29 +0000 (14:23 +0200)
committerMatt Caswell <matt@openssl.org>
Fri, 8 Dec 2017 09:46:21 +0000 (09:46 +0000)
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)

crypto/o_init.c

index 185841e..18bb858 100644 (file)
 #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
 
 /*