diff options
| author |   beck <beck@openbsd.org> | 2017-01-23 08:08:06 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-23 08:08:06 +0000 |
| commit | d2a38c8ae537989d0e986356a383eb44b37a2cb5 (patch) | |
| tree | 3cf685b3bcb37a7cd823730cd675d9ae504399b4 /lib/libssl/d1_enc.c | |
| parent | Add drivers for the Raspberry Pi 3. (diff) | |
| download | wireguard-openbsd-d2a38c8ae537989d0e986356a383eb44b37a2cb5.tar.xz wireguard-openbsd-d2a38c8ae537989d0e986356a383eb44b37a2cb5.zip | |
move back read_hash and enc_read_ctx into ssl_st. wpa_supplicant and
other perversions touches them sickly and unnaturally.
Diffstat (limited to 'lib/libssl/d1_enc.c')
| -rw-r--r-- | lib/libssl/d1_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/d1_enc.c b/lib/libssl/d1_enc.c index 0e49fb6df23..20686d29631 100644 --- a/lib/libssl/d1_enc.c +++ b/lib/libssl/d1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_enc.c,v 1.13 2017/01/23 06:45:30 beck Exp $ */ +/* $OpenBSD: d1_enc.c,v 1.14 2017/01/23 08:08:06 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -162,16 +162,16 @@ dtls1_enc(SSL *s, int send) } } } else { - if (EVP_MD_CTX_md(s->internal->read_hash)) { - mac_size = EVP_MD_CTX_size(s->internal->read_hash); + if (EVP_MD_CTX_md(s->read_hash)) { + mac_size = EVP_MD_CTX_size(s->read_hash); OPENSSL_assert(mac_size >= 0); } - ds = s->internal->enc_read_ctx; + ds = s->enc_read_ctx; rec = &(S3I(s)->rrec); - if (s->internal->enc_read_ctx == NULL) + if (s->enc_read_ctx == NULL) enc = NULL; else - enc = EVP_CIPHER_CTX_cipher(s->internal->enc_read_ctx); + enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx); } |