aboutsummaryrefslogtreecommitdiff
path: root/drivers/builtin_openssl2/openssl/bio.h
diff options
context:
space:
mode:
authormrezai2016-04-15 19:03:35 +0430
committerRémi Verschelde2016-04-27 08:49:39 +0200
commit3efa0f130dbaaba5eecb42f76ed7518eedfdf0c8 (patch)
tree91da0400f0a1386f7122e25c559abdfb53a9ec9e /drivers/builtin_openssl2/openssl/bio.h
parent47c7b535d2cdcb89c7799475662c70ca9c7ff41d (diff)
downloadgodot-3efa0f130dbaaba5eecb42f76ed7518eedfdf0c8.tar.gz
godot-3efa0f130dbaaba5eecb42f76ed7518eedfdf0c8.tar.zst
godot-3efa0f130dbaaba5eecb42f76ed7518eedfdf0c8.zip
Update OpenSSL to version 1.0.2g
(cherry picked from commit e97922f22038e9049ed4c2db5b3736dfaa0edde3)
Diffstat (limited to 'drivers/builtin_openssl2/openssl/bio.h')
-rw-r--r--drivers/builtin_openssl2/openssl/bio.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/builtin_openssl2/openssl/bio.h b/drivers/builtin_openssl2/openssl/bio.h
index 05f629aea..6790aed28 100644
--- a/drivers/builtin_openssl2/openssl/bio.h
+++ b/drivers/builtin_openssl2/openssl/bio.h
@@ -174,6 +174,7 @@ extern "C" {
# define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT 45/* Next DTLS handshake timeout
* to adjust socket timeouts */
+# define BIO_CTRL_DGRAM_SET_DONT_FRAG 48
# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD 49
@@ -688,7 +689,7 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
long argl, long ret);
BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *buf, int len);
+BIO *BIO_new_mem_buf(const void *buf, int len);
BIO_METHOD *BIO_s_socket(void);
BIO_METHOD *BIO_s_connect(void);
BIO_METHOD *BIO_s_accept(void);
@@ -729,6 +730,9 @@ int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
int BIO_dump_fp(FILE *fp, const char *s, int len);
int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
# endif
+int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
+ int datalen);
+
struct hostent *BIO_gethostbyname(const char *name);
/*-
* We might want a thread-safe interface too:
@@ -765,8 +769,8 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b);
int BIO_dgram_sctp_msg_waiting(BIO *b);
# endif
BIO *BIO_new_fd(int fd, int close_flag);
-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
+BIO *BIO_new_connect(const char *host_port);
+BIO *BIO_new_accept(const char *host_port);
int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
BIO **bio2, size_t writebuf2);