diff options
| author | Ben Laurie <ben@openssl.org> | 1999-04-23 15:01:15 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-04-23 15:01:15 +0000 |
| commit | 61f5b6f33807306d09bccbc2dcad474d1d04ca40 (patch) | |
| tree | 1680fa648df5f730df11ec433a512a1fadf0facd /ssl/t1_enc.c | |
| parent | 779cc0bca98e35830db455f34b986b86a2d2f822 (diff) | |
| download | openssl-61f5b6f33807306d09bccbc2dcad474d1d04ca40.tar.gz | |
Work with -pedantic!
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index daa15d0a30..99af1966e6 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -62,9 +62,9 @@ #include "hmac.h" #include "ssl_locl.h" -static void tls1_P_hash(const EVP_MD *md, unsigned char *sec, int sec_len, - unsigned char *seed, int seed_len, unsigned char *out, - int olen) +static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec, + int sec_len, unsigned char *seed, int seed_len, + unsigned char *out, int olen) { int chunk,n; unsigned int j; @@ -107,12 +107,12 @@ static void tls1_P_hash(const EVP_MD *md, unsigned char *sec, int sec_len, } static void tls1_PRF(const EVP_MD *md5, const EVP_MD *sha1, - unsigned char *label, int label_len, unsigned char *sec, - int slen, unsigned char *out1, unsigned char *out2, - int olen) + unsigned char *label, int label_len, + const unsigned char *sec, int slen, unsigned char *out1, + unsigned char *out2, int olen) { int len,i; - unsigned char *S1,*S2; + const unsigned char *S1,*S2; len=slen/2; S1=sec; @@ -150,6 +150,7 @@ static void tls1_generate_key_block(SSL *s, unsigned char *km, int tls1_change_cipher_state(SSL *s, int which) { + static const unsigned char empty[]=""; unsigned char *p,*key_block,*mac_secret; unsigned char *exp_label,buf[TLS_MD_MAX_CONST_SIZE+ SSL3_RANDOM_SIZE*2]; @@ -296,8 +297,8 @@ printf("which = %04X\nmac key=",which); p+=SSL3_RANDOM_SIZE; memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE); p+=SSL3_RANDOM_SIZE; - tls1_PRF(s->ctx->md5,s->ctx->sha1, - buf,(int)(p-buf),"",0,iv1,iv2,k*2); + tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,p-buf,empty,0, + iv1,iv2,k*2); if (client_write) iv=iv1; else |