diff options
| author |   jsing <jsing@openbsd.org> | 2018-09-08 14:39:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-09-08 14:39:41 +0000 |
| commit | ccfc0b04c0bee73b50fdfb0d219e172f018de475 (patch) | |
| tree | cb21fc0e3071629492577b0f618cd7ad8a07d609 /lib/libssl/ssl_pkt.c | |
| parent | SSL_MAX_DIGEST is no longer needed. (diff) | |
| download | wireguard-openbsd-ccfc0b04c0bee73b50fdfb0d219e172f018de475.tar.xz wireguard-openbsd-ccfc0b04c0bee73b50fdfb0d219e172f018de475.zip | |
Remove now unused code for EVP_CIPH_FLAG_AEAD_CIPHER and EVP_CIPH_GCM_MODE.
ok inoguchi@ tb@
Diffstat (limited to 'lib/libssl/ssl_pkt.c')
| -rw-r--r-- | lib/libssl/ssl_pkt.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/libssl/ssl_pkt.c b/lib/libssl/ssl_pkt.c index 163b0292af2..4e3ac7722aa 100644 --- a/lib/libssl/ssl_pkt.c +++ b/lib/libssl/ssl_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_pkt.c,v 1.12 2017/05/07 04:22:24 beck Exp $ */ +/* $OpenBSD: ssl_pkt.c,v 1.13 2018/09/08 14:39:41 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -739,6 +739,7 @@ do_ssl3_write(SSL *s, int type, const unsigned char *buf, p += 2; /* Explicit IV length. */ + eivlen = 0; 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) { @@ -746,16 +747,10 @@ do_ssl3_write(SSL *s, int type, const unsigned char *buf, if (eivlen <= 1) eivlen = 0; } - /* Need explicit part of IV for GCM mode */ - else if (mode == EVP_CIPH_GCM_MODE) - eivlen = EVP_GCM_TLS_EXPLICIT_IV_LEN; - else - 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; - } else - eivlen = 0; + } /* lets setup the record stuff. */ wr->data = p + eivlen; |