generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use uint32_t and int32_t for SSL_CIPHER structure.

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-11-05 16:14:17 +00:00
parent d99b0691d3
commit 90d9e49a4b
7 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/s3_lib.c
View File

@@ -4763,9 +4763,9 @@ const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
{
SSL_CIPHER c;
const SSL_CIPHER *cp;
unsigned long id;
uint32_t id;
id = 0x03000000L | ((unsigned long)p[0] << 8L) | (unsigned long)p[1];
id = 0x03000000 | ((uint32_t)p[0] << 8L) | (uint32_t)p[1];
c.id = id;
cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS);
#ifdef DEBUG_PRINT_UNKNOWN_CIPHERSUITES
@@ -4915,7 +4915,7 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
{
int ret = 0;
int nostrict = 1;
unsigned long alg_k, alg_a = 0;
uint32_t alg_k, alg_a = 0;
/* If we have custom certificate types set, use them */
if (s->cert->ctypes) {