wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert unnecessary SSL_CIPHER_get_bits API change

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Viktor Dukhovni 2015-12-04 00:27:47 -05:00
parent f6e9c55331
commit 1c86d8fd41
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/openssl/ssl.h
View file

@ -1391,7 +1391,7 @@ __owur int SSL_clear(SSL *s);
void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm); void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
__owur const SSL_CIPHER *SSL_get_current_cipher(const SSL *s); __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 char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
__owur const char *SSL_CIPHER_get_name(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); __owur uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c);

8
ssl/ssl_ciph.c
View file

@ -1864,14 +1864,14 @@ const char *SSL_CIPHER_get_name(const SSL_CIPHER *c)
} }
/* number of bits for symmetric cipher */ /* 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 (c != NULL) {
if (alg_bits != NULL) if (alg_bits != NULL)
*alg_bits = c->alg_bits; *alg_bits = (int) c->alg_bits;
ret = c->strength_bits; ret = (int) c->strength_bits;
} }
return ret; return ret;
} }