[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b5319bdbd095ff59d084af5ce16e5f715963557d (commit)
      from  dcf6e50f48e6bab92dcd2dacb27fc17c0de34199 (commit)


- Log -----------------------------------------------------------------
commit b5319bdbd095ff59d084af5ce16e5f715963557d
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Jun 30 13:55:08 2017 -0400

    Fix atfork flag.  Avoid double-negatives :)
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/3815)

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

Summary of changes:
 crypto/init.c                     | 2 +-
 doc/man3/OPENSSL_fork_prepare.pod | 2 +-
 doc/man3/OPENSSL_init_crypto.pod  | 4 ++--
 include/openssl/crypto.h          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/init.c b/crypto/init.c
index bc96171..a2634d9 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -552,7 +552,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
             && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests))
         return 0;
 
-    if ((opts & OPENSSL_INIT_NO_ATFORK) == 0
+    if ((opts & OPENSSL_INIT_ATFORK)
             && !openssl_init_fork_handlers())
         return 0;
 
diff --git a/doc/man3/OPENSSL_fork_prepare.pod b/doc/man3/OPENSSL_fork_prepare.pod
index 4d05096..99ec1a4 100644
--- a/doc/man3/OPENSSL_fork_prepare.pod
+++ b/doc/man3/OPENSSL_fork_prepare.pod
@@ -30,7 +30,7 @@ such as Linux that have both functions will normally not need to call these
 functions as the OpenSSL library will do so automatically.
 
 L<OPENSSL_init_crypto(3)> will register these funtions with the appropriate
-hander, unless the B<OPENSSL_INIT_NO_ATFORK> flag is used. For those
+hander, when the B<OPENSSL_INIT_ATFORK> flag is used. For other
 applications, these functions can be called directly. They should be used
 according to the calling sequence described by the pthreads_atfork(3)
 documentation, which is summarized here.  OPENSSL_fork_prepare() should
diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index 1ee7705..ce7497e 100644
--- a/doc/man3/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
@@ -150,9 +150,9 @@ With this option the library will automatically load and initialise all the
 built in engines listed above with the exception of the openssl and dasync
 engines. This not a default option.
 
-=item OPENSSL_INIT_NO_ATFORK
+=item OPENSSL_INIT_ATFORK
 
-With this option the library will not register its fork handlers.
+With this option the library will register its fork handlers.
 See OPENSSL_fork_prepare(3) for details.
 
 =back
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 06ca40e..ad2cfe5 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -370,7 +370,7 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
 # define OPENSSL_INIT_ENGINE_PADLOCK         0x00004000L
 # define OPENSSL_INIT_ENGINE_AFALG           0x00008000L
 # define OPENSSL_INIT_reserved_internal      0x00010000L
-# define OPENSSL_INIT_NO_ATFORK              0x00020000L
+# define OPENSSL_INIT_ATFORK                 0x00020000L
 /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */
 /* Max OPENSSL_INIT flag value is 0x80000000 */