[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a4a18b2f891c59fd78ad520da79146af13063892 (commit)
      from  e8fd2a4cb49c91e5af1608b3cd494e2a8cf02ae2 (commit)


- Log -----------------------------------------------------------------
commit a4a18b2f891c59fd78ad520da79146af13063892
Author: JimC <jim at carroll.com>
Date:   Sat Aug 6 06:22:04 2016 -0400

    Fix CIPHER_DEBUG
    
    Commit 3eb2aff renamed a field of ssl_cipher_st from algorithm_ssl -> min_tls but neglected to update the fprintf reference which is included by -DCIPHER_DEBUG
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1417)

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

Summary of changes:
 ssl/ssl_ciph.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 2f036c3..060bd9d 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -864,7 +864,7 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
             fprintf(stderr,
                     "\nName: %s:\nAlgo = %08x/%08x/%08x/%08x/%08x Algo_strength = %08x\n",
                     cp->name, cp->algorithm_mkey, cp->algorithm_auth,
-                    cp->algorithm_enc, cp->algorithm_mac, cp->algorithm_ssl,
+                    cp->algorithm_enc, cp->algorithm_mac, cp->min_tls,
                     cp->algo_strength);
 #endif
             if (alg_mkey && !(alg_mkey & cp->algorithm_mkey))