From f05c52aa76a00f8868af9655f7175b76580f1fc3 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Mon, 23 Jan 2017 22:34:38 +0000
Subject: move default_passwd_cb and default_passwd_cb_userdata back into the
 ssl_ctx from internal - these are used directly by python and openvpn and a
 few other things - we have the set accessors but the get accessors were added
 in 1.1 and these roll their own caveat OPENSSL_VERSION chickenpluckery

---
 src/lib/libssl/ssl.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/lib/libssl/ssl.h')

diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 28b7de6667..075c37e853 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.119 2017/01/23 14:35:42 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.120 2017/01/23 22:34:38 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -680,6 +680,17 @@ struct ssl_ctx_st {
 
 	X509_VERIFY_PARAM *param;
 
+	/*
+	 * XXX
+	 * default_passwd_cb used by python and openvpn, need to keep it until we
+	 * add an accessor
+	 */
+	/* Default password callback. */
+	pem_password_cb *default_passwd_callback;
+
+	/* Default password callback user data. */
+	void *default_passwd_callback_userdata;
+
 	struct ssl_ctx_internal_st *internal;
 };
 
-- 
cgit v1.2.3-55-g6feb