Commit 1c86d8fd authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Revert unnecessary SSL_CIPHER_get_bits API change 



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

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -1391,7 +1391,7 @@ __owur int SSL_clear(SSL *s); 
void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);



__owur const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);

__owur int32_t SSL_CIPHER_get_bits(const SSL_CIPHER *c, uint32_t *alg_bits);

__owur int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);

__owur char *SSL_CIPHER_get_version(const SSL_CIPHER *c);

__owur const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);

__owur uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c);

ssl/ssl_ciph.c

+4 −4
Original line number Diff line number Diff line
@@ -1864,14 +1864,14 @@ const char *SSL_CIPHER_get_name(const SSL_CIPHER *c) 
}



/* number of bits for symmetric cipher */

int32_t SSL_CIPHER_get_bits(const SSL_CIPHER *c, uint32_t *alg_bits)

int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits)

{

    int32_t ret = 0;

    int ret = 0;



    if (c != NULL) {

        if (alg_bits != NULL)

            *alg_bits = c->alg_bits;

        ret = c->strength_bits;

            *alg_bits = (int) c->alg_bits;

        ret = (int) c->strength_bits;

    }

    return ret;

}