summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-02-18 12:58:25 +0000
committertb <>2018-02-18 12:58:25 +0000
commit9e320b370b52d7100229aad540de9a8bc5cf2266 (patch)
treeac1d981df5d82d44a2761e1df0287d35d5e39bca
parent08088224c26400ca4e52e683e20d87c097025de9 (diff)
downloadopenbsd-9e320b370b52d7100229aad540de9a8bc5cf2266.tar.gz
openbsd-9e320b370b52d7100229aad540de9a8bc5cf2266.tar.bz2
openbsd-9e320b370b52d7100229aad540de9a8bc5cf2266.zip
Provide BIO_{g,s}et_data() and BIO_set_init().
ok jsing
-rw-r--r--src/lib/libcrypto/Symbols.list3
-rw-r--r--src/lib/libcrypto/bio/bio.h5
-rw-r--r--src/lib/libcrypto/bio/bio_lib.c20
3 files changed, 26 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index e5997cc76d..f8125ad9f7 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -276,6 +276,7 @@ BIO_free_all
276BIO_get_accept_socket 276BIO_get_accept_socket
277BIO_get_callback 277BIO_get_callback
278BIO_get_callback_arg 278BIO_get_callback_arg
279BIO_get_data
279BIO_get_ex_data 280BIO_get_ex_data
280BIO_get_ex_new_index 281BIO_get_ex_new_index
281BIO_get_host_ip 282BIO_get_host_ip
@@ -334,9 +335,11 @@ BIO_s_socket
334BIO_set 335BIO_set
335BIO_set_callback 336BIO_set_callback
336BIO_set_callback_arg 337BIO_set_callback_arg
338BIO_set_data
337BIO_set_cipher 339BIO_set_cipher
338BIO_set_ex_data 340BIO_set_ex_data
339BIO_set_flags 341BIO_set_flags
342BIO_set_init
340BIO_set_tcp_ndelay 343BIO_set_tcp_ndelay
341BIO_snprintf 344BIO_snprintf
342BIO_sock_cleanup 345BIO_sock_cleanup
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 3a1577ab37..c60ab389a0 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio.h,v 1.31 2018/02/17 13:57:14 tb Exp $ */ 1/* $OpenBSD: bio.h,v 1.32 2018/02/18 12:58:25 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 *
@@ -586,6 +586,9 @@ BIO *BIO_new_fp(FILE *stream, int close_flag);
586BIO * BIO_new(BIO_METHOD *type); 586BIO * BIO_new(BIO_METHOD *type);
587int BIO_set(BIO *a, BIO_METHOD *type); 587int BIO_set(BIO *a, BIO_METHOD *type);
588int BIO_free(BIO *a); 588int BIO_free(BIO *a);
589void *BIO_get_data(BIO *a);
590void BIO_set_data(BIO *a, void *ptr);
591void BIO_set_init(BIO *a, int init);
589void BIO_vfree(BIO *a); 592void BIO_vfree(BIO *a);
590int BIO_read(BIO *b, void *data, int len) 593int BIO_read(BIO *b, void *data, int len)
591 __attribute__((__bounded__(__buffer__,2,3))); 594 __attribute__((__bounded__(__buffer__,2,3)));
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 86ccbdc202..4e5405d6af 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_lib.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */ 1/* $OpenBSD: bio_lib.c,v 1.24 2018/02/18 12:58:25 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 *
@@ -137,6 +137,24 @@ BIO_vfree(BIO *a)
137 BIO_free(a); 137 BIO_free(a);
138} 138}
139 139
140void *
141BIO_get_data(BIO *a)
142{
143 return (a->ptr);
144}
145
146void
147BIO_set_data(BIO *a, void *ptr)
148{
149 a->ptr = ptr;
150}
151
152void
153BIO_set_init(BIO *a, int init)
154{
155 a->init = init;
156}
157
140void 158void
141BIO_clear_flags(BIO *b, int flags) 159BIO_clear_flags(BIO *b, int flags)
142{ 160{