diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2017-01-23 22:34:39 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2017-01-23 22:34:39 +0000 |
| commit | b5e481f4b4019e537c8311cfa4e2a1d4c12f9d8f (patch) | |
| tree | 83643e7f34f80b88fe51c78b068889ed6f18eb13 /lib/libssl/ssl_locl.h | |
| parent | eacee96ec48d5bfa4ac95765a069137815608ba4 (diff) | |
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_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index d0d72cbfdf6..231e0ba3333 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.162 2017/01/23 14:35:42 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.163 2017/01/23 22:34:38 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -454,12 +454,6 @@ typedef struct ssl_ctx_internal_st { int (*app_verify_callback)(X509_STORE_CTX *, void *); void *app_verify_arg; - /* Default password callback. */ - pem_password_cb *default_passwd_callback; - - /* Default password callback user data. */ - void *default_passwd_callback_userdata; - /* get client cert callback */ int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey); |