Commit 627e2c45 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix SSL_get_shared_ciphers() 



The function SSL_get_shared_ciphers() is supposed to return ciphers shared
by the client and the server. However it only ever returned the client
ciphers.

Fixes #5317

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6114)
parent ebdeeb36

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ __owur int SSL_get_fd(const SSL *s); 
__owur int SSL_get_rfd(const SSL *s);

__owur int SSL_get_wfd(const SSL *s);

__owur const char *SSL_get_cipher_list(const SSL *s, int n);

__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);

__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size);

__owur int SSL_get_read_ahead(const SSL *s);

__owur int SSL_pending(const SSL *s);

__owur int SSL_has_pending(const SSL *s);

ssl/ssl_lib.c

+19 −10
Original line number Diff line number Diff line
@@ -2213,28 +2213,37 @@ int SSL_set_cipher_list(SSL *s, const char *str) 
    return 1;

}



char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len)

char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size)

{

    char *p;

    STACK_OF(SSL_CIPHER) *sk;

    STACK_OF(SSL_CIPHER) *clntsk, *srvrsk;

    const SSL_CIPHER *c;

    int i;



    if ((s->session == NULL) || (s->session->ciphers == NULL) || (len < 2))

        return (NULL);

    if (!s->server

            || s->session == NULL

            || s->session->ciphers == NULL

            || size < 2)

        return NULL;



    p = buf;

    sk = s->session->ciphers;

    clntsk = s->session->ciphers;

    srvrsk = SSL_get_ciphers(s);

    if (clntsk == NULL || srvrsk == NULL)

        return NULL;



    if (sk_SSL_CIPHER_num(sk) == 0)

    if (sk_SSL_CIPHER_num(clntsk) == 0 || sk_SSL_CIPHER_num(srvrsk) == 0)

        return NULL;



    for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {

    for (i = 0; i < sk_SSL_CIPHER_num(clntsk); i++) {

        int n;



        c = sk_SSL_CIPHER_value(sk, i);

        c = sk_SSL_CIPHER_value(clntsk, i);

        if (sk_SSL_CIPHER_find(srvrsk, c) < 0)

            continue;



        n = strlen(c->name);

        if (n + 1 > len) {

        if (n + 1 > size) {

            if (p != buf)

                --p;

            *p = '\0';
@@ -2243,7 +2252,7 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len) 
        memcpy(p, c->name, n + 1);

        p += n;

        *(p++) = ':';

        len -= n + 1;

        size -= n + 1;

    }

    p[-1] = '\0';

    return (buf);