Commit 800fe8e3 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Drop support for printing SSLv2 ciphers names. 

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>

MR: #2083
parent 43986596

apps/s_cb.c

+3 −2
Changes for apps/s_cb.c: 3 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -1061,11 +1061,12 @@ int args_excert(int opt, SSL_EXCERT **pexc) 
static void print_raw_cipherlist(SSL *s)

static void print_raw_cipherlist(SSL *s)

{

{

    const unsigned char *rlist;

    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;

    size_t i, rlistlen, num;

    if (!SSL_is_server(s))

    if (!SSL_is_server(s))

        return;

        return;

    num = SSL_get0_raw_cipherlist(s, NULL);

    num = SSL_get0_raw_cipherlist(s, NULL);

    OPENSSL_assert(num == 2);

    rlistlen = SSL_get0_raw_cipherlist(s, &rlist);

    rlistlen = SSL_get0_raw_cipherlist(s, &rlist);

    BIO_puts(bio_err, "Client cipher list: ");

    BIO_puts(bio_err, "Client cipher list: ");

    for (i = 0; i < rlistlen; i += num, rlist += num) {

    for (i = 0; i < rlistlen; i += num, rlist += num) {
@@ -1074,7 +1075,7 @@ static void print_raw_cipherlist(SSL *s) 
            BIO_puts(bio_err, ":");

            BIO_puts(bio_err, ":");

        if (c)

        if (c)

            BIO_puts(bio_err, SSL_CIPHER_get_name(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");

            BIO_puts(bio_err, "SCSV");

        else {

        else {

            size_t j;

            size_t j;