merge coverity
--HG--
branch : coverity
diff --git a/.travis.yml b/.travis.yml
index 7852711..f503d02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,9 @@
os:
- linux
- - osx
-
-env:
- matrix:
- - BUNDLEDLIBTOM=--disable-bundled-libtom WEXTRAFLAGS=-Werror
- - BUNDLEDLIBTOM=--enable-bundled-libtom
- - MULTI=1
- - NOWRITEV=1
-
-# TODO: remove this section when libtomcrypt compiles on OSX: https://github.com/libtom/libtomcrypt/issues/82
-matrix:
- exclude:
- - os: osx
- env: BUNDLEDLIBTOM=--disable-bundled-libtom WEXTRAFLAGS=-Werror
compiler:
- gcc
- - clang
# container-based builds
sudo: false
@@ -28,26 +13,27 @@
packages:
# packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
- zlib1g-dev
- - libtomcrypt-dev
- - libtommath-dev
-
-
-before_install:
- - if [ "$CC" = "clang" ]; then WEXTRAFLAGS="$WEXTRAFLAGS -Wno-error=incompatible-library-redeclaration" ; fi # workaround
-
-install:
- - if [ "$TRAVIS_OS_NAME" = "osx" -a "$BUNDLEDLIBTOM" = "--disable-bundled-libtom" ]; then brew update > /dev/null && brew install libtomcrypt libtommath ; fi
script:
- - autoconf && autoheader && ./configure "$BUNDLEDLIBTOM" CFLAGS="-O2 -Wall -Wno-pointer-sign $WEXTRAFLAGS" --prefix="$HOME/inst"
- - if [ "$NOWRITEV" = "1" ]; then sed -i -e s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi
+ - autoconf && autoheader && ./configure CFLAGS="-O2 -Wall -Wno-pointer-sign" --prefix="$HOME/inst"
- make -j3
# avoid concurrent install, osx/freebsd is racey (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208093)
- make install
-after_success:
- - ~/inst/bin/dropbearkey -t rsa -f testrsa
- - ~/inst/bin/dropbearkey -t dss -f testdss
- - ~/inst/bin/dropbearkey -t ecdsa -f testec256 -s 256
- - ~/inst/bin/dropbearkey -t ecdsa -f testec384 -s 384
- - ~/inst/bin/dropbearkey -t ecdsa -f testec521 -s 521
+env:
+ global:
+ # The next declration is the encrypted COVERITY_SCAN_TOKEN, created
+ # via the "travis encrypt" command using the project repo's public key
+ - secure: "F4rKQrHK/u58vPo3F9+x0WYXAeMFJvvtH9BIGZqx9yw8bUnL+gk0Ge9wnHHTXRcgCTqoc7B35uMS5njpH+Su/esVjrLAq85f/AmQctlRpmApwGK9LyxkIvx3UJN0nqfeeDXA90/8FUZ+n/qnCydXmYCEgqSaBCNydDxW1oqYUIc="
+ - BUNDLEDLIBTOM=--enable-bundled-libtom
+ - MULTI=1
+
+addons:
+ coverity_scan:
+ project:
+ name: "mkj/dropbear"
+ description: "Dropbear SSH"
+ notification_email: matt@ucc.asn.au
+ build_command_prepend: autoconf && autoheader && ./configure --enable-bundled-libtom CFLAGS='-O2 -Wall -Wno-pointer-sign' --prefix=$HOME/inst
+ build_command: make MULTI=1
+ branch_pattern: coverity