From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Fri, 4 Dec 2015 05:27:47 +0000 (-0500)
Subject: Revert unnecessary SSL_CIPHER_get_bits API change
X-Git-Tag: OpenSSL_1_1_0-pre1~133
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c86d8fd41458d35736ef5b04d7a76cbcf1a274c;p=oweals%2Fopenssl.git

Revert unnecessary SSL_CIPHER_get_bits API change

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

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index e3072e7266..2f3f514690 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -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);
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 58fd1fadf6..58acec4235 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -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;
 }