diff options
| author |   tb <tb@openbsd.org> | 2018-03-17 15:48:31 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-03-17 15:48:31 +0000 |
| commit | bc7da7f04a6d48adb89905472ac2e1396fc714a9 (patch) | |
| tree | f43b869ff60a31236b0bb3364d0e0102ac9d4086 /lib/libssl | |
| parent | Provide X509_STORE_get0_param() (diff) | |
| download | wireguard-openbsd-bc7da7f04a6d48adb89905472ac2e1396fc714a9.tar.xz wireguard-openbsd-bc7da7f04a6d48adb89905472ac2e1396fc714a9.zip | |
Provide SSL_CTX_get_default_passwd_cb{,_userdata}()
ok jsing
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/Symbols.list | 2 | ||||
| -rw-r--r-- | lib/libssl/ssl.h | 4 | ||||
| -rw-r--r-- | lib/libssl/ssl_lib.c | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/libssl/Symbols.list b/lib/libssl/Symbols.list index cf5ff1453d8..3f632724426 100644 --- a/lib/libssl/Symbols.list +++ b/lib/libssl/Symbols.list @@ -67,6 +67,8 @@ SSL_CTX_get_cert_store SSL_CTX_get_ciphers SSL_CTX_get_client_CA_list SSL_CTX_get_client_cert_cb +SSL_CTX_get_default_passwd_cb +SSL_CTX_get_default_passwd_cb_userdata SSL_CTX_get_ex_data SSL_CTX_get_ex_new_index SSL_CTX_get_info_callback diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 63577663c8b..17b9467ae0d 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.150 2018/03/17 14:47:48 tb Exp $ */ +/* $OpenBSD: ssl.h,v 1.151 2018/03/17 15:48:31 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1361,7 +1361,9 @@ int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx, const unsigned char *d, lo int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x); int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d); +pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx); void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb); +void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx); void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u); int SSL_CTX_check_private_key(const SSL_CTX *ctx); diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 067f0edde45..eca3c97facf 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.180 2018/03/15 12:27:01 jca Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.181 2018/03/17 15:48:31 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1991,12 +1991,24 @@ SSL_CTX_up_ref(SSL_CTX *ctx) return ((refs > 1) ? 1 : 0); } +pem_password_cb * +SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) +{ + return (ctx->default_passwd_callback); +} + void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) { ctx->default_passwd_callback = cb; } +void * +SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx) +{ + return ctx->default_passwd_callback_userdata; +} + void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u) { |