diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-11-05 16:14:17 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-11-08 14:03:50 +0000 |
| commit | 90d9e49a4b2344a7a313eed70becb6cd3bf152e9 (patch) | |
| tree | c1974ca27a0be655c619a0b0867a735225ffde16 /ssl/s3_lib.c | |
| parent | d99b0691d3a5d215e8d4dbe1b7224e066153fe2c (diff) | |
| download | openssl-90d9e49a4b2344a7a313eed70becb6cd3bf152e9.zip openssl-90d9e49a4b2344a7a313eed70becb6cd3bf152e9.tar.gz openssl-90d9e49a4b2344a7a313eed70becb6cd3bf152e9.tar.bz2 | |
Use uint32_t and int32_t for SSL_CIPHER structure.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 39d08a0..1c7e7a2 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -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) { |