diff options
| author | tedu <> | 2014-05-30 14:30:50 +0000 |
|---|---|---|
| committer | tedu <> | 2014-05-30 14:30:50 +0000 |
| commit | d970fd597dc43c71716f5ce1db8f102515a73ad8 (patch) | |
| tree | cbf937e75b5dc1f5e8f2452d45ad4d6942a9b1d4 /src/lib/libssl/s3_pkt.c | |
| parent | d7bb67cc99974281f55641afa52a0f9e8f1ff938 (diff) | |
| download | openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.tar.gz openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.tar.bz2 openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.zip | |
remove some #if 0 code. we don't need any more reminders that we're using
a not quite appropriate data structure. ok jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s3_pkt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index b8be8b5255..f8f31f2a4a 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c | |||
| @@ -645,11 +645,7 @@ do_ssl3_write(SSL *s, int type, const unsigned char *buf, | |||
| 645 | 645 | ||
| 646 | if ((sess == NULL) || (s->enc_write_ctx == NULL) || | 646 | if ((sess == NULL) || (s->enc_write_ctx == NULL) || |
| 647 | (EVP_MD_CTX_md(s->write_hash) == NULL)) { | 647 | (EVP_MD_CTX_md(s->write_hash) == NULL)) { |
| 648 | #if 1 | ||
| 649 | clear = s->enc_write_ctx ? 0 : 1; /* must be AEAD cipher */ | 648 | clear = s->enc_write_ctx ? 0 : 1; /* must be AEAD cipher */ |
| 650 | #else | ||
| 651 | clear = 1; | ||
| 652 | #endif | ||
| 653 | mac_size = 0; | 649 | mac_size = 0; |
| 654 | } else { | 650 | } else { |
| 655 | mac_size = EVP_MD_CTX_size(s->write_hash); | 651 | mac_size = EVP_MD_CTX_size(s->write_hash); |
