diff options
| author | Joe Orton <joe@manyfish.uk> | 2020-06-18 08:33:38 +0100 |
|---|---|---|
| committer | Joe Orton <joe@manyfish.uk> | 2020-06-18 08:33:38 +0100 |
| commit | 487668a1b387413e7b839feaa58e86664ed17793 (patch) | |
| tree | c2b984359e9e447b3a9d269e54bacd6e98c6d9ac | |
| parent | a058e1f3a65f15d72ba679c0397b0dc8e573cf97 (diff) | |
| download | neon-git-487668a1b387413e7b839feaa58e86664ed17793.tar.gz | |
* test/ssl.c (fail_nul_san): Skip for GnuTLS builds.
* .travis.yml: Add more GnuTLS jobs, addd s390x to allow_failures.
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | test/ssl.c | 8 |
2 files changed, 17 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 52f0426..46c1319 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,18 +63,26 @@ matrix: compiler: gcc dist: bionic env: CONF="--with-ssl=openssl" - - name: GnuTLS - compiler: gcc - env: CONF="--with-ssl=gnutls" - name: OpenSSL memleak compiler: gcc env: CONF="--with-ssl=openssl --enable-memleak" + - name: GnuTLS + env: CONF="--with-ssl=gnutls" + - name: GnuTLS on bionic + dist: bionic + env: CONF="--with-ssl=gnutls" + - name: GnuTLS on trusty + dist: trusty + env: CONF="--with-ssl=gnutls" + - name: GnuTLS memleak + env: CONF="--with-ssl=gnutls --enable-memleak" - name: Copyright check compiler: gcc env: CONF="--without-libproxy --without-gssapi --without-zlib --disable-nls --disable-debug --disable-webdav" MARGS="update-copyright" allow_failures: - - name: GnuTLS - compiler: gcc - env: CONF="--with-ssl=gnutls" + # s390x builds currently flaky + - name: OpenSSL on s390x + arch: s390x + env: CONF="--with-ssl=openssl" script: ./autogen.sh && ./configure --enable-warnings $CONF && make $MARGS @@ -908,7 +908,6 @@ static int fail_nul_cn(void) ne_free(ca); return OK; } -#endif static int fail_nul_san(void) { @@ -924,6 +923,7 @@ static int fail_nul_san(void) ne_free(ca); return OK; } +#endif /* Check that an expired certificate is flagged as such. */ static int fail_expired(void) @@ -1946,12 +1946,10 @@ ne_test tests[] = { T(nulcn_identity), #ifndef HAVE_GNUTLS - /* test failing with GnuTLS since GnuTLS fails handshake? - * fail_nul_cn (no error in verification callback; request rv 1 error string: Server certificate was missing commonName attribute in subject name) - */ + /* These certs were created with a SHA#1 digest so are rejected by GnuTLS. */ T(fail_nul_cn), -#endif T(fail_nul_san), +#endif #if 0 T(session_cache), |