[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  18df0adda98f8f21cc494b4835c2817bcadbeb8a (commit)
      from  6957d91f0eed10859dff26311592b326a07a1d73 (commit)


- Log -----------------------------------------------------------------
commit 18df0adda98f8f21cc494b4835c2817bcadbeb8a
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Mon Sep 26 14:23:29 2016 +0200

    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 at ncp-e.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4870)

-----------------------------------------------------------------------

Summary of changes:
 crypto/o_init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/o_init.c b/crypto/o_init.c
index 185841e..18bb858 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
 
 /*