diff options
Diffstat (limited to 'src/lib/libssl/d1_enc.c')
-rw-r--r-- | src/lib/libssl/d1_enc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libssl/d1_enc.c b/src/lib/libssl/d1_enc.c index 4b13e094fe..0e49fb6df2 100644 --- a/src/lib/libssl/d1_enc.c +++ b/src/lib/libssl/d1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_enc.c,v 1.12 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: d1_enc.c,v 1.13 2017/01/23 06:45:30 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -139,17 +139,17 @@ dtls1_enc(SSL *s, int send) | |||
139 | const EVP_CIPHER *enc; | 139 | const EVP_CIPHER *enc; |
140 | 140 | ||
141 | if (send) { | 141 | if (send) { |
142 | if (EVP_MD_CTX_md(s->write_hash)) { | 142 | if (EVP_MD_CTX_md(s->internal->write_hash)) { |
143 | mac_size = EVP_MD_CTX_size(s->write_hash); | 143 | mac_size = EVP_MD_CTX_size(s->internal->write_hash); |
144 | if (mac_size < 0) | 144 | if (mac_size < 0) |
145 | return -1; | 145 | return -1; |
146 | } | 146 | } |
147 | ds = s->enc_write_ctx; | 147 | ds = s->internal->enc_write_ctx; |
148 | rec = &(S3I(s)->wrec); | 148 | rec = &(S3I(s)->wrec); |
149 | if (s->enc_write_ctx == NULL) | 149 | if (s->internal->enc_write_ctx == NULL) |
150 | enc = NULL; | 150 | enc = NULL; |
151 | else { | 151 | else { |
152 | enc = EVP_CIPHER_CTX_cipher(s->enc_write_ctx); | 152 | enc = EVP_CIPHER_CTX_cipher(s->internal->enc_write_ctx); |
153 | if (rec->data != rec->input) { | 153 | if (rec->data != rec->input) { |
154 | #ifdef DEBUG | 154 | #ifdef DEBUG |
155 | /* we can't write into the input stream */ | 155 | /* we can't write into the input stream */ |
@@ -162,16 +162,16 @@ dtls1_enc(SSL *s, int send) | |||
162 | } | 162 | } |
163 | } | 163 | } |
164 | } else { | 164 | } else { |
165 | if (EVP_MD_CTX_md(s->read_hash)) { | 165 | if (EVP_MD_CTX_md(s->internal->read_hash)) { |
166 | mac_size = EVP_MD_CTX_size(s->read_hash); | 166 | mac_size = EVP_MD_CTX_size(s->internal->read_hash); |
167 | OPENSSL_assert(mac_size >= 0); | 167 | OPENSSL_assert(mac_size >= 0); |
168 | } | 168 | } |
169 | ds = s->enc_read_ctx; | 169 | ds = s->internal->enc_read_ctx; |
170 | rec = &(S3I(s)->rrec); | 170 | rec = &(S3I(s)->rrec); |
171 | if (s->enc_read_ctx == NULL) | 171 | if (s->internal->enc_read_ctx == NULL) |
172 | enc = NULL; | 172 | enc = NULL; |
173 | else | 173 | else |
174 | enc = EVP_CIPHER_CTX_cipher(s->enc_read_ctx); | 174 | enc = EVP_CIPHER_CTX_cipher(s->internal->enc_read_ctx); |
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||