summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-06-08 14:33:04 +0000
committerjsing <>2014-06-08 14:33:04 +0000
commitb0da9db60669f98a52f338ea5655182f0d65d7e2 (patch)
tree530a88168316b6ae7dd26c307fb9c59d94f585e8 /src
parent7f731b6a4cae5265fbadf7e68953547e6d0cc72b (diff)
downloadopenbsd-b0da9db60669f98a52f338ea5655182f0d65d7e2.tar.gz
openbsd-b0da9db60669f98a52f338ea5655182f0d65d7e2.tar.bz2
openbsd-b0da9db60669f98a52f338ea5655182f0d65d7e2.zip
Be explicit with types. No binary change.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/t1_enc.c6
-rw-r--r--src/lib/libssl/t1_enc.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 5f5c8e3488..353a408c98 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -306,9 +306,9 @@ tls1_generate_key_block(SSL *s, unsigned char *km, unsigned char *tmp, int num)
306 */ 306 */
307static int 307static int
308tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys, 308tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys,
309 const unsigned char *mac_secret, unsigned mac_secret_size, 309 const unsigned char *mac_secret, unsigned int mac_secret_size,
310 const unsigned char *key, unsigned key_len, const unsigned char *iv, 310 const unsigned char *key, unsigned int key_len, const unsigned char *iv,
311 unsigned iv_len) 311 unsigned int iv_len)
312{ 312{
313 static const unsigned char empty[] = ""; 313 static const unsigned char empty[] = "";
314 unsigned char export_tmp1[EVP_MAX_KEY_LENGTH]; 314 unsigned char export_tmp1[EVP_MAX_KEY_LENGTH];
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 5f5c8e3488..353a408c98 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -306,9 +306,9 @@ tls1_generate_key_block(SSL *s, unsigned char *km, unsigned char *tmp, int num)
306 */ 306 */
307static int 307static int
308tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys, 308tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys,
309 const unsigned char *mac_secret, unsigned mac_secret_size, 309 const unsigned char *mac_secret, unsigned int mac_secret_size,
310 const unsigned char *key, unsigned key_len, const unsigned char *iv, 310 const unsigned char *key, unsigned int key_len, const unsigned char *iv,
311 unsigned iv_len) 311 unsigned int iv_len)
312{ 312{
313 static const unsigned char empty[] = ""; 313 static const unsigned char empty[] = "";
314 unsigned char export_tmp1[EVP_MAX_KEY_LENGTH]; 314 unsigned char export_tmp1[EVP_MAX_KEY_LENGTH];