[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d1776fdecd6a8677a281a85498a74a8480739689 (commit)
      from  6baa3b430555d25b6eee6440a6b8bee80eaabfc3 (commit)


- Log -----------------------------------------------------------------
commit d1776fdecd6a8677a281a85498a74a8480739689
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Feb 18 07:59:41 2016 -0500

    Fix {TLS,CIPHER}_DEBUG compiles.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/ssl_ciph.c | 4 ++--
 ssl/t1_enc.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f78984c..cd6c3c9 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -892,7 +892,7 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
 
 #ifdef CIPHER_DEBUG
     fprintf(stderr,
-            "Applying rule %d with %08lx/%08lx/%08lx/%08lx/%08lx %08lx (%d)\n",
+            "Applying rule %d with %08x/%08x/%08x/%08x/%08x %08x (%d)\n",
             rule, alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl,
             algo_strength, strength_bits);
 #endif
@@ -936,7 +936,7 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
         } else {
 #ifdef CIPHER_DEBUG
             fprintf(stderr,
-                    "\nName: %s:\nAlgo = %08lx/%08lx/%08lx/%08lx/%08lx Algo_strength = %08lx\n",
+                    "\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->algo_strength);
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 995ae40..6b3a73e 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -525,7 +525,7 @@ int tls1_setup_key_block(SSL *s)
     {
         int z;
         for (z = 0; z < num; z++)
-            printf("%02X%c", p1[z], ((z + 1) % 16) ? ' ' : '\n');
+            printf("%02X%c", p[z], ((z + 1) % 16) ? ' ' : '\n');
     }
 #endif