diff options
| author | tb <> | 2024-04-15 15:40:08 +0000 |
|---|---|---|
| committer | tb <> | 2024-04-15 15:40:08 +0000 |
| commit | 6b4f40197e2ae07caa53cf304deca0b5bfc5514c (patch) | |
| tree | d4b796385706ef0ad29160e115d1c3c0d9904d9a | |
| parent | 3924b7499b722296b842fd02f66a2a05b7c15acc (diff) | |
| download | openbsd-6b4f40197e2ae07caa53cf304deca0b5bfc5514c.tar.gz openbsd-6b4f40197e2ae07caa53cf304deca0b5bfc5514c.tar.bz2 openbsd-6b4f40197e2ae07caa53cf304deca0b5bfc5514c.zip | |
Move BIO_CONNECT_{new,free}() to internal-only
ok jsing
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 9327ca0bfb..36bf47c4eb 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -217,8 +217,6 @@ BF_encrypt | |||
| 217 | BF_ofb64_encrypt | 217 | BF_ofb64_encrypt |
| 218 | BF_set_key | 218 | BF_set_key |
| 219 | BIGNUM_it | 219 | BIGNUM_it |
| 220 | BIO_CONNECT_free | ||
| 221 | BIO_CONNECT_new | ||
| 222 | BIO_accept | 220 | BIO_accept |
| 223 | BIO_callback_ctrl | 221 | BIO_callback_ctrl |
| 224 | BIO_clear_flags | 222 | BIO_clear_flags |
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 427bd4b9ed..b4516afa2d 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_conn.c,v 1.39 2023/07/07 19:37:53 beck Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.40 2024/04/15 15:40:08 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 | * |
| @@ -105,8 +105,8 @@ static long conn_callback_ctrl(BIO *h, int cmd, BIO_info_cb *); | |||
| 105 | 105 | ||
| 106 | static int conn_state(BIO *b, BIO_CONNECT *c); | 106 | static int conn_state(BIO *b, BIO_CONNECT *c); |
| 107 | static void conn_close_socket(BIO *data); | 107 | static void conn_close_socket(BIO *data); |
| 108 | BIO_CONNECT *BIO_CONNECT_new(void); | 108 | static BIO_CONNECT *BIO_CONNECT_new(void); |
| 109 | void BIO_CONNECT_free(BIO_CONNECT *a); | 109 | static void BIO_CONNECT_free(BIO_CONNECT *a); |
| 110 | 110 | ||
| 111 | static const BIO_METHOD methods_connectp = { | 111 | static const BIO_METHOD methods_connectp = { |
| 112 | .type = BIO_TYPE_CONNECT, | 112 | .type = BIO_TYPE_CONNECT, |
| @@ -289,7 +289,7 @@ end: | |||
| 289 | return (ret); | 289 | return (ret); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | BIO_CONNECT * | 292 | static BIO_CONNECT * |
| 293 | BIO_CONNECT_new(void) | 293 | BIO_CONNECT_new(void) |
| 294 | { | 294 | { |
| 295 | BIO_CONNECT *ret; | 295 | BIO_CONNECT *ret; |
| @@ -310,7 +310,7 @@ BIO_CONNECT_new(void) | |||
| 310 | return (ret); | 310 | return (ret); |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | void | 313 | static void |
| 314 | BIO_CONNECT_free(BIO_CONNECT *a) | 314 | BIO_CONNECT_free(BIO_CONNECT *a) |
| 315 | { | 315 | { |
| 316 | if (a == NULL) | 316 | if (a == NULL) |
