diff options
| author |   beck <beck@openbsd.org> | 2017-01-23 06:45:30 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-23 06:45:30 +0000 |
| commit | b084913af34130559f11bce93b5619f290347501 (patch) | |
| tree | 52e36803afaacde2673f6c0c667d204f38604d42 /lib/libssl/d1_enc.c | |
| parent | No need to explicitly use config_activate_children in the cfattach struct. (diff) | |
| download | wireguard-openbsd-b084913af34130559f11bce93b5619f290347501.tar.xz wireguard-openbsd-b084913af34130559f11bce93b5619f290347501.zip | |
Move a large part of ssl_st into internal, so we can see what squeals.
ok jsing@
Diffstat (limited to 'lib/libssl/d1_enc.c')
| -rw-r--r-- | lib/libssl/d1_enc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/libssl/d1_enc.c b/lib/libssl/d1_enc.c index 4b13e094fe6..0e49fb6df23 100644 --- a/lib/libssl/d1_enc.c +++ b/lib/libssl/d1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_enc.c,v 1.12 2017/01/22 09:02:07 jsing Exp $ */ +/* $OpenBSD: d1_enc.c,v 1.13 2017/01/23 06:45:30 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -139,17 +139,17 @@ dtls1_enc(SSL *s, int send) const EVP_CIPHER *enc; if (send) { - if (EVP_MD_CTX_md(s->write_hash)) { - mac_size = EVP_MD_CTX_size(s->write_hash); + if (EVP_MD_CTX_md(s->internal->write_hash)) { + mac_size = EVP_MD_CTX_size(s->internal->write_hash); if (mac_size < 0) return -1; } - ds = s->enc_write_ctx; + ds = s->internal->enc_write_ctx; rec = &(S3I(s)->wrec); - if (s->enc_write_ctx == NULL) + if (s->internal->enc_write_ctx == NULL) enc = NULL; else { - enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx); + enc = EVP_CIPHER_CTX_cipher(s->internal->enc_write_ctx); if (rec->data != rec->input) { #ifdef DEBUG /* we can't write into the input stream */ @@ -162,16 +162,16 @@ dtls1_enc(SSL *s, int send) } } } else { - if (EVP_MD_CTX_md(s->read_hash)) { - mac_size = EVP_MD_CTX_size(s->read_hash); + if (EVP_MD_CTX_md(s->internal->read_hash)) { + mac_size = EVP_MD_CTX_size(s->internal->read_hash); OPENSSL_assert(mac_size >= 0); } - ds = s->enc_read_ctx; + ds = s->internal->enc_read_ctx; rec = &(S3I(s)->rrec); - if (s->enc_read_ctx == NULL) + if (s->internal->enc_read_ctx == NULL) enc = NULL; else - enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx); + enc = EVP_CIPHER_CTX_cipher(s->internal->enc_read_ctx); } |