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_lib.c | |
| 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_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 20b671022d4..7f49648611f 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.140 2017/01/23 14:35:42 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.141 2017/01/23 22:34:38 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1858,8 +1858,8 @@ SSL_CTX_new(const SSL_METHOD *meth) if ((ret->internal->cert = ssl_cert_new()) == NULL) goto err; - ret->internal->default_passwd_callback = 0; - ret->internal->default_passwd_callback_userdata = NULL; + ret->default_passwd_callback = 0; + ret->default_passwd_callback_userdata = NULL; ret->internal->client_cert_cb = 0; ret->internal->app_gen_cookie_cb = 0; ret->internal->app_verify_cookie_cb = 0; @@ -2015,13 +2015,13 @@ SSL_CTX_free(SSL_CTX *a) void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) { - ctx->internal->default_passwd_callback = cb; + ctx->default_passwd_callback = cb; } void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u) { - ctx->internal->default_passwd_callback_userdata = u; + ctx->default_passwd_callback_userdata = u; } void |