浏览代码

Switch options and mode bits to uint32_t from unsigned long.

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>
kris/onging/CECPQ3_patch15
David Benjamin 9 年前
committed by Adam Langley
父节点
当前提交
123a8fdb98
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. +4
    -4
      include/openssl/ssl.h
  2. +1
    -1
      ssl/ssl_lib.c

+ 4
- 4
include/openssl/ssl.h 查看文件

@@ -837,8 +837,8 @@ struct ssl_ctx_st {
/* Default values to use in SSL structures follow (these are copied by
* SSL_new) */

unsigned long options;
unsigned long mode;
uint32_t options;
uint32_t mode;
long max_cert_list;

struct cert_st /* CERT */ *cert;
@@ -1340,8 +1340,8 @@ struct ssl_st {
/* for server side, keep the list of CA_dn we can use */
STACK_OF(X509_NAME) *client_CA;

unsigned long options; /* protocol behaviour */
unsigned long mode; /* API behaviour */
uint32_t options; /* protocol behaviour */
uint32_t mode; /* API behaviour */
long max_cert_list;
int client_version; /* what was passed, used for
* SSLv3/TLS rollback check */


+ 1
- 1
ssl/ssl_lib.c 查看文件

@@ -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) {
unsigned long options = s->options;
uint32_t options = s->options;
uint16_t version = 0;

/* OpenSSL's API for controlling versions entails blacklisting individual


正在加载...
取消
保存