diff options
| author |   beck <beck@openbsd.org> | 2017-01-23 22:34:38 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-23 22:34:38 +0000 |
| commit | c420d3582ba29659f87f83a8b9eed5bd498ce630 (patch) | |
| tree | 25f1475c6499475f6d1dbc17cc0cfd302a32194c /lib/libssl/ssl.h | |
| parent | Avoid curproc dance in dupfdopen(), by passing a struct proc * (diff) | |
| download | wireguard-openbsd-c420d3582ba29659f87f83a8b9eed5bd498ce630.tar.xz wireguard-openbsd-c420d3582ba29659f87f83a8b9eed5bd498ce630.zip | |
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
Diffstat (limited to 'lib/libssl/ssl.h')
| -rw-r--r-- | lib/libssl/ssl.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 28b7de66675..075c37e8535 100644 --- a/lib/libssl/ssl.h +++ b/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; }; |