[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  6b2e51dd36c2f7f1ec24e84288324a12cfe3549e (commit)
      from  6466cc97e8222ef69c6bd46a2819a0d6947f0084 (commit)


- Log -----------------------------------------------------------------
commit 6b2e51dd36c2f7f1ec24e84288324a12cfe3549e
Author: Alexander Traud <pabstraud at compuserve.com>
Date:   Tue Mar 23 17:32:44 2021 +0100

    ssl/ssl_ciph.c: update format string, again
    
    Commit 2664810 changed everything except the encoding.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14673)

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

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 80014a31fd..1de8959506 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1676,7 +1676,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
     const char *ver;
     const char *kx, *au, *enc, *mac;
     uint32_t alg_mkey, alg_auth, alg_enc, alg_mac;
-    static const char *format = "%-30s %-7s Kx=%-8s Au=%-5s Enc=%-9s Mac=%-4s\n";
+    static const char *format = "%-30s %-7s Kx=%-8s Au=%-5s Enc=%-22s Mac=%-4s\n";
 
     if (buf == NULL) {
         len = 128;