The branch master has been updated
via c2efa78309e39019642f922b2babc1fd35f68768 (commit)
from d485640b8083aea895ecf31b4ea6a338ee561b67 (commit)
- Log -----------------------------------------------------------------
commit c2efa78309e39019642f922b2babc1fd35f68768
Author: Viktor Szakats <vszak...@users.noreply.github.com>
Date: Tue Aug 30 18:56:49 2016 +0200
bio.h: fix number of arguments passed to BIO_ptr_ctrl()
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1520)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/bio.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 31d41b4..9bc941b 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -365,9 +365,9 @@ struct bio_dgram_sctp_prinfo {
# define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char
*)port)
# define BIO_set_conn_address(b,addr) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char
*)addr)
# define BIO_set_conn_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-# define BIO_get_conn_hostname(b) ((const char
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
-# define BIO_get_conn_port(b) ((const char
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
-# define BIO_get_conn_address(b) ((const BIO_ADDR
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
+# define BIO_get_conn_hostname(b) ((const char
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
+# define BIO_get_conn_port(b) ((const char
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
+# define BIO_get_conn_address(b) ((const BIO_ADDR
*)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
# define BIO_get_conn_ip_family(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
# define BIO_set_conn_mode(b,n)
BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
