[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  6ad8253306f96e1a749d020ddbb131c71aa1edf8 (commit)
      from  e6b5cbb45ae6258a5a096e2c3b207f662e97532e (commit)


- Log -----------------------------------------------------------------
commit 6ad8253306f96e1a749d020ddbb131c71aa1edf8
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Apr 6 08:44:58 2018 +0100

    Fix an error code to be consistent with master
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5892)

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

Summary of changes:
 include/openssl/conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 845abf5..f85b40d 100644
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -191,7 +191,7 @@ int ERR_load_CONF_strings(void);
 # define CONF_F_NCONF_LOAD_BIO                            110
 # define CONF_F_NCONF_LOAD_FP                             114
 # define CONF_F_NCONF_NEW                                 111
-# define CONF_F_SSL_MODULE_INIT                           122
+# define CONF_F_SSL_MODULE_INIT                           123
 # define CONF_F_STR_COPY                                  101
 
 /* Reason codes. */