diff options
| -rw-r--r-- | .travis.yml | 62 | ||||
| -rw-r--r-- | Makefile.in | 5 |
2 files changed, 22 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml index 478dda8..69b980e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,36 +3,6 @@ language: c git: depth: 3 -# use focal which provides libtommath 1.20 -dist: focal - -matrix: - include: - - name: "plain linux" - compiler: gcc - env: WEXTRAFLAGS=-Werror - - name: "multi binary" - env: MULTI=1 WEXTRAFLAGS=-Werror - - name: "bundled libtom, xenial, no writev()" - # NOWRITEV is unrelated to libtom/xenial, test here to save a job - env: CONFIGURE_FLAGS=--enable-bundled-libtom WEXTRAFLAGS=-Werror NOWRITEV=1 - # can use an older distro with bundled libtom - dist: xenial - - name: "linux clang" - os: linux - compiler: clang - env: WEXTRAFLAGS=-Werror - - name: "osx" - os: osx - compiler: clang - # OS X says daemon() and utmp are deprecated - env: WEXTRAFLAGS="-Wno-deprecated-declarations -Werror" - # Note: the fuzzing malloc wrapper doesn't replace free() in system libtomcrypt, so need bundled. - - name: "fuzzing" - env: DO_FUZZ=1 CONFIGURE_FLAGS="--enable-fuzz --disable-harden --enable-bundled-libtom" WEXTRAFLAGS=-Werror LDFLAGS=-fsanitize=address EXTRACFLAGS=-fsanitize=address CXX=clang++ - compiler: clang - -# container-based builds addons: apt: packages: @@ -40,33 +10,35 @@ addons: - zlib1g-dev - libtomcrypt-dev - libtommath-dev - - mercurial - -before_install: - - if [ "$CC" = "clang" ]; then WEXTRAFLAGS="$WEXTRAFLAGS -Wno-error=incompatible-library-redeclaration" ; fi # workaround install: - autoconf - autoheader - ./configure $CONFIGURE_FLAGS CFLAGS="-O2 -Wall -Wno-pointer-sign $WEXTRAFLAGS $EXTRACFLAGS" --prefix="$HOME/inst" || (cat config.log; exit 1) - if [ "$NOWRITEV" = "1" ]; then sed -i -e s/HAVE_WRITEV/DONT_HAVE_WRITEV/ config.h ; fi - - make lint - make -j3 - - test -z $DO_FUZZ || make fuzzstandalone # avoid concurrent install, osx/freebsd is racey (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208093) - make install -script: - - ~/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 - - ~/inst/bin/dropbearkey -t ed25519 -f tested25519 - - test -z $DO_FUZZ || ./fuzzers_test.sh +env: + global: + # The next declaration 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 branches: only: - master - coverity - diff --git a/Makefile.in b/Makefile.in index 145617b..d57e308 100644 --- a/Makefile.in +++ b/Makefile.in @@ -326,3 +326,8 @@ fuzz-hostkeys: /usr/bin/xxd -i -a keye >> hostkeys.c /usr/bin/xxd -i -a keyd >> hostkeys.c /usr/bin/xxd -i -a keyed25519 >> hostkeys.c + +# to make coverity happy? +test: + true + |