From: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Date: Mon, 26 Sep 2016 12:23:29 +0000 (+0200)
Subject: Add missing prototype for FIPS callback
X-Git-Tag: OpenSSL_1_0_2o~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18df0adda98f8f21cc494b4835c2817bcadbeb8a;p=oweals%2Fopenssl.git

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)
---

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
 
 /*