summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorbeck <>2017-01-23 08:08:06 +0000
committerbeck <>2017-01-23 08:08:06 +0000
commitba841e9426c50ad2174e15eea62a99c0bf5dce1b (patch)
treeb37034dc473f23646288550afc5f1edd686f739e /src/lib/libssl/ssl_locl.h
parent2cc7590bd8c0089cea24719cef8e387ac293c43b (diff)
downloadopenbsd-ba841e9426c50ad2174e15eea62a99c0bf5dce1b.tar.gz
openbsd-ba841e9426c50ad2174e15eea62a99c0bf5dce1b.tar.bz2
openbsd-ba841e9426c50ad2174e15eea62a99c0bf5dce1b.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 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index d8818e1850..6da2ce3fab 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.158 2017/01/23 06:45:30 beck Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.159 2017/01/23 08:08:06 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -670,9 +670,6 @@ typedef struct ssl_internal_st {
670 enc_read_ctx and read_hash are 670 enc_read_ctx and read_hash are
671 ignored. */ 671 ignored. */
672 672
673 EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */
674 EVP_MD_CTX *read_hash; /* used for mac generation */
675
676 SSL_AEAD_CTX *aead_write_ctx; /* AEAD context. If non-NULL, then 673 SSL_AEAD_CTX *aead_write_ctx; /* AEAD context. If non-NULL, then
677 enc_write_ctx and write_hash are 674 enc_write_ctx and write_hash are
678 ignored. */ 675 ignored. */