diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 067f0edde4..eca3c97fac 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.180 2018/03/15 12:27:01 jca Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.181 2018/03/17 15:48:31 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1991,12 +1991,24 @@ SSL_CTX_up_ref(SSL_CTX *ctx) | |||
1991 | return ((refs > 1) ? 1 : 0); | 1991 | return ((refs > 1) ? 1 : 0); |
1992 | } | 1992 | } |
1993 | 1993 | ||
1994 | pem_password_cb * | ||
1995 | SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) | ||
1996 | { | ||
1997 | return (ctx->default_passwd_callback); | ||
1998 | } | ||
1999 | |||
1994 | void | 2000 | void |
1995 | SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) | 2001 | SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) |
1996 | { | 2002 | { |
1997 | ctx->default_passwd_callback = cb; | 2003 | ctx->default_passwd_callback = cb; |
1998 | } | 2004 | } |
1999 | 2005 | ||
2006 | void * | ||
2007 | SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx) | ||
2008 | { | ||
2009 | return ctx->default_passwd_callback_userdata; | ||
2010 | } | ||
2011 | |||
2000 | void | 2012 | void |
2001 | SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u) | 2013 | SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u) |
2002 | { | 2014 | { |