summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/Symbols.list1
-rw-r--r--src/lib/libssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl_lib.c9
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index c91dff9e58..e2862d6243 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -115,6 +115,7 @@ SSL_CTX_set_tmp_rsa_callback
115SSL_CTX_set_trust 115SSL_CTX_set_trust
116SSL_CTX_set_verify 116SSL_CTX_set_verify
117SSL_CTX_set_verify_depth 117SSL_CTX_set_verify_depth
118SSL_CTX_up_ref
118SSL_CTX_use_PrivateKey 119SSL_CTX_use_PrivateKey
119SSL_CTX_use_PrivateKey_ASN1 120SSL_CTX_use_PrivateKey_ASN1
120SSL_CTX_use_PrivateKey_file 121SSL_CTX_use_PrivateKey_file
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 7768f0a80f..51b8fdb3cc 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.135 2018/02/14 16:16:10 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.136 2018/02/14 17:08:44 jsing 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 *
@@ -1208,6 +1208,7 @@ void BIO_ssl_shutdown(BIO *ssl_bio);
1208int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str); 1208int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
1209SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth); 1209SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
1210void SSL_CTX_free(SSL_CTX *); 1210void SSL_CTX_free(SSL_CTX *);
1211int SSL_CTX_up_ref(SSL_CTX *ctx);
1211long SSL_CTX_set_timeout(SSL_CTX *ctx, long t); 1212long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
1212long SSL_CTX_get_timeout(const SSL_CTX *ctx); 1213long SSL_CTX_get_timeout(const SSL_CTX *ctx);
1213X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *); 1214X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 9e3ef90729..16f2b54637 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.173 2018/02/14 16:16:10 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.174 2018/02/14 17:08:44 jsing 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 *
@@ -1964,6 +1964,13 @@ SSL_CTX_free(SSL_CTX *ctx)
1964 free(ctx); 1964 free(ctx);
1965} 1965}
1966 1966
1967int
1968SSL_CTX_up_ref(SSL_CTX *ctx)
1969{
1970 int refs = CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX);
1971 return ((refs > 1) ? 1 : 0);
1972}
1973
1967void 1974void
1968SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) 1975SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb)
1969{ 1976{