diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-08-09 15:46:29 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-08-09 15:46:29 +0000 |
| commit | 3b64cbebab7e4b3804c0b8b10522a72e53167188 (patch) | |
| tree | 5cf86e18e7dfc16d860de6e023a87cafeda5b7f4 /lib | |
| parent | bfe3a48e4275a0b2932dd4bc9000f58465febe28 (diff) | |
Make the explicit IV length handling in DTLS the same as SSL3/TLS.
ok inoguchi@ tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/d1_pkt.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c index 0caf2a59656..5bbdf5f7384 100644 --- a/lib/libssl/d1_pkt.c +++ b/lib/libssl/d1_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_pkt.c,v 1.76 2020/08/02 07:33:15 jsing Exp $ */ +/* $OpenBSD: d1_pkt.c,v 1.77 2020/08/09 15:46:28 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -1229,13 +1229,18 @@ do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len) p += DTLS1_RT_HEADER_LENGTH; - /* - * Make space for the explicit IV in case of CBC. - * (this is a bit of a boundary violation, but what the heck). - */ - if (s->internal->enc_write_ctx && - (EVP_CIPHER_mode(s->internal->enc_write_ctx->cipher) & EVP_CIPH_CBC_MODE)) - eivlen = EVP_CIPHER_block_size(s->internal->enc_write_ctx->cipher); + /* Explicit IV length. */ + if (s->internal->enc_write_ctx && SSL_USE_EXPLICIT_IV(s)) { + int mode = EVP_CIPHER_CTX_mode(s->internal->enc_write_ctx); + if (mode == EVP_CIPH_CBC_MODE) { + eivlen = EVP_CIPHER_CTX_iv_length(s->internal->enc_write_ctx); + if (eivlen <= 1) + eivlen = 0; + } + } else if (s->internal->aead_write_ctx != NULL && + s->internal->aead_write_ctx->variable_nonce_in_record) { + eivlen = s->internal->aead_write_ctx->variable_nonce_len; + } wr->type = type; wr->data = p + eivlen; |