[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

Paul I. Dale pauli at openssl.org
Mon Nov 5 21:09:11 UTC 2018


The branch OpenSSL_1_1_1-stable has been updated
       via  0f316a0c208b90336b171fa05f8eaf4056c5a01d (commit)
      from  030da7436ed0f8feb65d3f0c5fd86f87f5ee2483 (commit)


- Log -----------------------------------------------------------------
commit 0f316a0c208b90336b171fa05f8eaf4056c5a01d
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Nov 6 07:06:25 2018 +1000

    Fix return formatting.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7564)
    
    (cherry picked from commit 2087028612027368e9508e1b253aab715a5a35d6)

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

Summary of changes:
 ssl/ssl_lib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 96b3ed0..17b13d1 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -5106,7 +5106,8 @@ static int nss_keylog_int(const char *prefix,
     size_t i;
     size_t prefix_len;
 
-    if (ssl->ctx->keylog_callback == NULL) return 1;
+    if (ssl->ctx->keylog_callback == NULL)
+        return 1;
 
     /*
      * Our output buffer will contain the following strings, rendered with


More information about the openssl-commits mailing list