[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  fa8edbbd59dd2ea04e6b6ebaefc1be72c9fd7ba4 (commit)
      from  70c9f1c878502ccb717fbec54cecfc17187cf501 (commit)


- Log -----------------------------------------------------------------
commit fa8edbbd59dd2ea04e6b6ebaefc1be72c9fd7ba4
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Thu Jan 14 11:43:21 2016 +0100

    Updated OSSL_DYNAMIC_VERSION/OSSL_DYNAMIC_OLDEST
    
    Change to reflect changes in dynamic_fns
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 include/openssl/engine.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 3e0208f..6d3fe37 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -712,12 +712,12 @@ void ENGINE_add_conf_module(void);
 /**************************/
 
 /* Binary/behaviour compatibility levels */
-# define OSSL_DYNAMIC_VERSION            (unsigned long)0x00020000
+# define OSSL_DYNAMIC_VERSION            (unsigned long)0x00030000
 /*
  * Binary versions older than this are too old for us (whether we're a loader
  * or a loadee)
  */
-# define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00020000
+# define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00030000
 
 /*
  * When compiling an ENGINE entirely as an external shared library, loadable