admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Leave BIO_METHOD non-const.

Browse Source 
This breaks building against OpenSSL upstream, which is still supported on iOS.
This reverts part of https://webrtc-codereview.appspot.com/34649004.

BUG=none
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36879004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8132 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
davidben@webrtc.org 2015-01-22 23:06:17 +00:00
parent 586f2eda0d
commit 36d5c3cb44
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/base/openssladapter.cc
View File

@ -74,7 +74,8 @@ static long socket_ctrl(BIO* h, int cmd, long arg1, void* arg2);
static int socket_new(BIO* h);
static int socket_free(BIO* data);
static const BIO_METHOD methods_socket = {
// TODO(davidben): This should be const once BoringSSL is assumed.
static BIO_METHOD methods_socket = {
BIO_TYPE_BIO,
"socket",
socket_write,
@ -87,7 +88,7 @@ static const BIO_METHOD methods_socket = {
NULL,
};
static const BIO_METHOD* BIO_s_socket2() { return(&methods_socket); }
static BIO_METHOD* BIO_s_socket2() { return(&methods_socket); }
static BIO* BIO_new_socket(rtc::AsyncSocket* socket) {
BIO* ret = BIO_new(BIO_s_socket2());

5
webrtc/base/opensslstreamadapter.cc
View File

@ -67,7 +67,8 @@ static long stream_ctrl(BIO* h, int cmd, long arg1, void* arg2);
static int stream_new(BIO* h);
static int stream_free(BIO* data);
static const BIO_METHOD methods_stream = {
// TODO(davidben): This should be const once BoringSSL is assumed.
static BIO_METHOD methods_stream = {
BIO_TYPE_BIO,
"stream",
stream_write,
@ -80,7 +81,7 @@ static const BIO_METHOD methods_stream = {
NULL,
};
static const BIO_METHOD* BIO_s_stream() { return(&methods_stream); }
static BIO_METHOD* BIO_s_stream() { return(&methods_stream); }
static BIO* BIO_new_stream(StreamInterface* stream) {
BIO* ret = BIO_new(BIO_s_stream());