diff options
-rw-r--r-- | src/lib/libssl/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libssl/ssl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 9 |
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 | |||
115 | SSL_CTX_set_trust | 115 | SSL_CTX_set_trust |
116 | SSL_CTX_set_verify | 116 | SSL_CTX_set_verify |
117 | SSL_CTX_set_verify_depth | 117 | SSL_CTX_set_verify_depth |
118 | SSL_CTX_up_ref | ||
118 | SSL_CTX_use_PrivateKey | 119 | SSL_CTX_use_PrivateKey |
119 | SSL_CTX_use_PrivateKey_ASN1 | 120 | SSL_CTX_use_PrivateKey_ASN1 |
120 | SSL_CTX_use_PrivateKey_file | 121 | SSL_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); | |||
1208 | int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str); | 1208 | int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str); |
1209 | SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth); | 1209 | SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth); |
1210 | void SSL_CTX_free(SSL_CTX *); | 1210 | void SSL_CTX_free(SSL_CTX *); |
1211 | int SSL_CTX_up_ref(SSL_CTX *ctx); | ||
1211 | long SSL_CTX_set_timeout(SSL_CTX *ctx, long t); | 1212 | long SSL_CTX_set_timeout(SSL_CTX *ctx, long t); |
1212 | long SSL_CTX_get_timeout(const SSL_CTX *ctx); | 1213 | long SSL_CTX_get_timeout(const SSL_CTX *ctx); |
1213 | X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *); | 1214 | X509_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 | ||
1967 | int | ||
1968 | SSL_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 | |||
1967 | void | 1974 | void |
1968 | SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) | 1975 | SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb) |
1969 | { | 1976 | { |