summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorbeck <>2017-01-23 08:08:06 +0000
committerbeck <>2017-01-23 08:08:06 +0000
commitc85967e4f9c3e1f3b3217545939f1d44ddf9f103 (patch)
treeb37034dc473f23646288550afc5f1edd686f739e /src/lib/libssl/ssl.h
parentc403bebb7042a1c21959aded78bf10bad7a40a52 (diff)
downloadopenbsd-c85967e4f9c3e1f3b3217545939f1d44ddf9f103.tar.gz
openbsd-c85967e4f9c3e1f3b3217545939f1d44ddf9f103.tar.bz2
openbsd-c85967e4f9c3e1f3b3217545939f1d44ddf9f103.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.h')
-rw-r--r--src/lib/libssl/ssl.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 4069fcd024..678246b23e 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.114 2017/01/23 06:45:30 beck Exp $ */ 1/* $OpenBSD: ssl.h,v 1.115 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 *
@@ -894,6 +894,14 @@ struct ssl_st {
894 SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */ 894 SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
895#define session_ctx initial_ctx 895#define session_ctx initial_ctx
896 896
897 /*
898 * XXX really should be internal, but is
899 * touched unnaturally by wpa-supplicant
900 * and freeradius and other perversions
901 */
902 EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */
903 EVP_MD_CTX *read_hash; /* used for mac generation */
904
897 struct ssl_internal_st *internal; 905 struct ssl_internal_st *internal;
898}; 906};
899 907