Commit 5788f3be authored by Manuel Schölling's avatar Manuel Schölling
Browse files

Use latest OpenSSL version in travis tests and more verbose error message in ConnectedSocket

parent 014f59ae

.travis.yml

+14 −4
Original line number Diff line number Diff line
@@ -5,13 +5,23 @@ os: 
env:

  global:

  - secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=

  - FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npn"

  - FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npp"

before_install:

  - DIR=`pwd`

  - (test $TRAVIS_OS_NAME == "osx" || (sudo apt-get install gcc make))

  - (test $TRAVIS_OS_NAME == "osx" || (wget http://openssl.org/source/openssl-1.0.2.tar.gz -O /tmp/openssl-1.0.2.tar.gz))

  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp && tar xzf openssl-1.0.2.tar.gz))

  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && ./config --prefix=/usr/ shared))

  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && make))

  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && sudo make install))

  - cd ${DIR}

before_script:

  - openssl version

  - 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 &

- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && cargo test --features "$FEATURES"))

- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)

- (test $TRAVIS_OS_NAME == "osx" || (./openssl/test/test.sh &))

- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))

- ./.travis/build_docs.sh

after_success:

- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && ./.travis/update_docs.sh

openssl/src/ssl/connected_socket.rs

+5 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ impl<S: AsRawFd+?Sized> Read for ConnectedSocket<S> { 
				match errno() {

					EAGAIN => Err(Error::new(ErrorKind::Interrupted, "EAGAIN", None)),

					_ => Err(Error::new(ErrorKind::Other,

							"recv() returned -1", None)),

							"recv() returned -1",

							Some(os::error_string(os::errno() as i32)))),

				}

			},

			0 => Err(Error::new(ErrorKind::Other,
@@ -234,7 +235,9 @@ impl<S: AsRawFd+?Sized> Write for ConnectedSocket<S> { 
		if res == (buf.len() as i64) {

			Ok(res as usize)

		} else {

			Err(Error::new(ErrorKind::Other, "send() failed", Some(os::error_string(os::errno() as i32))))

			Err(Error::new(ErrorKind::Other,

				"send() failed",

				Some(os::error_string(os::errno() as i32))))

		}

	}