[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  800fe8e339f0926b0ddda9cd1959c19bd17dc65b (commit)
      from  43986596c672eb5dd20c363f12fef09a04cdc9e5 (commit)


- Log -----------------------------------------------------------------
commit 800fe8e339f0926b0ddda9cd1959c19bd17dc65b
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Feb 21 19:57:43 2016 +0100

    Drop support for printing SSLv2 ciphers names.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    
    MR: #2083

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

Summary of changes:
 apps/s_cb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index b74d682..8a25d17 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1061,11 +1061,12 @@ int args_excert(int opt, SSL_EXCERT **pexc)
 static void print_raw_cipherlist(SSL *s)
 {
     const unsigned char *rlist;
-    static const unsigned char scsv_id[] = { 0, 0, 0xFF };
+    static const unsigned char scsv_id[] = { 0, 0xFF };
     size_t i, rlistlen, num;
     if (!SSL_is_server(s))
         return;
     num = SSL_get0_raw_cipherlist(s, NULL);
+    OPENSSL_assert(num == 2);
     rlistlen = SSL_get0_raw_cipherlist(s, &rlist);
     BIO_puts(bio_err, "Client cipher list: ");
     for (i = 0; i < rlistlen; i += num, rlist += num) {
@@ -1074,7 +1075,7 @@ static void print_raw_cipherlist(SSL *s)
             BIO_puts(bio_err, ":");
         if (c)
             BIO_puts(bio_err, SSL_CIPHER_get_name(c));
-        else if (!memcmp(rlist, scsv_id - num + 3, num))
+        else if (!memcmp(rlist, scsv_id, num))
             BIO_puts(bio_err, "SCSV");
         else {
             size_t j;