kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch options and mode bits to uint32_t from unsigned long.

Browse Source 
This is a bitmask, so the number of bits available should be the same
across all platforms.

Change-Id: I98e8d375fc7d042aeae1270174bc8fc63fba5dfc
Reviewed-on: https://boringssl-review.googlesource.com/4556
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-04-26 14:16:41 -04:00 committed by Adam Langley
parent 8c24980d83
commit 123a8fdb98
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/openssl/ssl.h
View File

@ -837,8 +837,8 @@ struct ssl_ctx_st {
/* Default values to use in SSL structures follow (these are copied by /* Default values to use in SSL structures follow (these are copied by
* SSL_new) */ * SSL_new) */
unsigned long options; uint32_t options;
unsigned long mode; uint32_t mode;
long max_cert_list; long max_cert_list;
struct cert_st /* CERT */ *cert; struct cert_st /* CERT */ *cert;
@ -1340,8 +1340,8 @@ struct ssl_st {
/* for server side, keep the list of CA_dn we can use */ /* for server side, keep the list of CA_dn we can use */
STACK_OF(X509_NAME) *client_CA; STACK_OF(X509_NAME) *client_CA;
unsigned long options; /* protocol behaviour */ uint32_t options; /* protocol behaviour */
unsigned long mode; /* API behaviour */ uint32_t mode; /* API behaviour */
long max_cert_list; long max_cert_list;
int client_version; /* what was passed, used for int client_version; /* what was passed, used for
* SSLv3/TLS rollback check */ * SSLv3/TLS rollback check */

2
ssl/ssl_lib.c
View File

@ -2833,7 +2833,7 @@ uint16_t ssl3_get_mutual_version(SSL *s, uint16_t client_version) {
} }
uint16_t ssl3_get_max_client_version(SSL *s) { uint16_t ssl3_get_max_client_version(SSL *s) {
unsigned long options = s->options; uint32_t options = s->options;
uint16_t version = 0; uint16_t version = 0;
/* OpenSSL's API for controlling versions entails blacklisting individual /* OpenSSL's API for controlling versions entails blacklisting individual