min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix OSX related compiler error and correct travis OpenSSL setup

This commit is contained in:
Manuel Schölling 2015-03-12 20:17:47 +01:00
parent 3abce328f1
commit 3680763906
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -7,7 +7,7 @@ env:
- secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=
- FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npn"
before_script:
- ./openssl/test/test.sh &
- openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &
script:
- (cd openssl && cargo test)
- ./openssl/test/test.sh &

6
openssl/src/ssl/connected_socket.rs
View File

@ -71,7 +71,7 @@ fn new_sockaddr_in() -> sockaddr_in {
target_os = "windows")))]
fn new_sockaddr_in() -> sockaddr_in {
sockaddr_in {
sin_len: mem::size_of::<sockaddr_in>(),
sin_len: mem::size_of::<sockaddr_in>() as u8,
sin_family: AF_INET as sa_family_t,
sin_port: 0,
sin_zero: [0; 8],
@ -99,7 +99,7 @@ fn new_sockaddr_in6() -> sockaddr_in6 {
target_os = "windows")))]
fn new_sockaddr_in6() -> sockaddr_in6 {
sockaddr_in6 {
sin6_len: mem::size_of::<sockaddr_in6>(),
sin6_len: mem::size_of::<sockaddr_in6>() as u8,
sin6_family: AF_INET6 as sa_family_t,
sin6_port: 0,
sin6_flowinfo: 0,
@ -256,7 +256,7 @@ impl<S:AsRawFd> SetTimeout for S {
unsafe {
setsockopt(self.as_raw_fd(), SOL_SOCKET, SO_RCVTIMEO,
mem::transmute(&tv), mem::size_of_val(&tv) as u32)
mem::transmute(&tv), mem::size_of_val(&tv) as socklen_t)
};
}
}