diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-22 02:59:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-22 02:59:26 +0000 |
| commit | 72b60351f17f26568e3af698fab4abd043b3fa29 (patch) | |
| tree | e3aee906dafb7a38a275c590a49ff93ccfec6cd5 /ssl | |
| parent | 1b8a8088a5d55d5474fd7f89bc991326cc0430d7 (diff) | |
Change EVP_MD_CTX_type so it is more logical and add EVP_MD_CTX_md for
the old functionality.
Various warning fixes.
Initial EVP symmetric cipher docs.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_srvr.c | 1 | ||||
| -rw-r--r-- | ssl/s3_both.c | 2 | ||||
| -rw-r--r-- | ssl/s3_enc.c | 2 | ||||
| -rw-r--r-- | ssl/s3_pkt.c | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 33634efdcb..5b38f9e285 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -389,7 +389,6 @@ int ssl23_get_client_hello(SSL *s) } } -next_bit: if (s->state == SSL23_ST_SR_CLNT_HELLO_B) { /* we have SSLv3/TLSv1 in an SSLv2 header diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 035a937ba7..846fc67772 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -76,7 +76,7 @@ int ssl3_do_write(SSL *s, int type) if (type == SSL3_RT_HANDSHAKE) /* should not be done for 'Hello Request's, but in that case * we'll ignore the result anyway */ - ssl3_finish_mac(s,&s->init_buf->data[s->init_off],ret); + ssl3_finish_mac(s,(unsigned char *)&s->init_buf->data[s->init_off],ret); if (ret == s->init_num) return(1); diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index f340fc5d5f..df4acab3d0 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -443,7 +443,7 @@ static int ssl3_handshake_mac(SSL *s, EVP_MD_CTX *in_ctx, EVP_DigestUpdate(&ctx,ssl3_pad_1,npad); EVP_DigestFinal(&ctx,md_buf,&i); - EVP_DigestInit(&ctx,EVP_MD_CTX_type(&ctx)); + EVP_DigestInit(&ctx,EVP_MD_CTX_md(&ctx)); EVP_DigestUpdate(&ctx,s->session->master_key, s->session->master_key_length); EVP_DigestUpdate(&ctx,ssl3_pad_2,npad); diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index fd344c4ceb..97501dcac8 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -827,8 +827,8 @@ start: */ { int dest_maxlen = 0; - unsigned char *dest; - int *dest_len; + unsigned char *dest = NULL; + int *dest_len = NULL; if (rr->type == SSL3_RT_HANDSHAKE) { |