提交 b43d1cbb 编写于 作者: M Matt Caswell

Convert various mac_secret_size usage to size_t

Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 d0e7c31d
...@@ -1144,9 +1144,9 @@ struct ssl_st { ...@@ -1144,9 +1144,9 @@ struct ssl_st {
typedef struct ssl3_state_st { typedef struct ssl3_state_st {
long flags; long flags;
int read_mac_secret_size; size_t read_mac_secret_size;
unsigned char read_mac_secret[EVP_MAX_MD_SIZE]; unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
int write_mac_secret_size; size_t write_mac_secret_size;
unsigned char write_mac_secret[EVP_MAX_MD_SIZE]; unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
unsigned char server_random[SSL3_RANDOM_SIZE]; unsigned char server_random[SSL3_RANDOM_SIZE];
unsigned char client_random[SSL3_RANDOM_SIZE]; unsigned char client_random[SSL3_RANDOM_SIZE];
...@@ -1205,7 +1205,7 @@ typedef struct ssl3_state_st { ...@@ -1205,7 +1205,7 @@ typedef struct ssl3_state_st {
const EVP_CIPHER *new_sym_enc; const EVP_CIPHER *new_sym_enc;
const EVP_MD *new_hash; const EVP_MD *new_hash;
int new_mac_pkey_type; int new_mac_pkey_type;
int new_mac_secret_size; size_t new_mac_secret_size;
# ifndef OPENSSL_NO_COMP # ifndef OPENSSL_NO_COMP
const SSL_COMP *new_compression; const SSL_COMP *new_compression;
# else # else
......
...@@ -116,10 +116,10 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -116,10 +116,10 @@ int tls1_change_cipher_state(SSL *s, int which)
#endif #endif
const EVP_MD *m; const EVP_MD *m;
int mac_type; int mac_type;
int *mac_secret_size; size_t *mac_secret_size;
EVP_MD_CTX *mac_ctx; EVP_MD_CTX *mac_ctx;
EVP_PKEY *mac_key; EVP_PKEY *mac_key;
int n, i, j, k, cl; size_t n, i, j, k, cl;
int reuse_dd = 0; int reuse_dd = 0;
c = s->s3->tmp.new_sym_enc; c = s->s3->tmp.new_sym_enc;
...@@ -214,6 +214,7 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -214,6 +214,7 @@ int tls1_change_cipher_state(SSL *s, int which)
p = s->s3->tmp.key_block; p = s->s3->tmp.key_block;
i = *mac_secret_size = s->s3->tmp.new_mac_secret_size; i = *mac_secret_size = s->s3->tmp.new_mac_secret_size;
/* TODO(size_t): convert me */
cl = EVP_CIPHER_key_length(c); cl = EVP_CIPHER_key_length(c);
j = cl; j = cl;
/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */ /* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册