diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-16 23:54:28 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-17 00:09:36 +0100 |
| commit | 5dcadbf4edc474a0e55a3caaa3604ed06b6a3926 (patch) | |
| tree | eb8eb74b6a0a4d6a8688b4c94460f043db907721 /test/src/client.c | |
| parent | 059f2aced50773fa38661a5a30c54260aee4bf55 (diff) | |
Testsuite: force non-TLSv1.3 for (OpenSSL) cert-variable test
This maintains visibility of the cert choice required by the auth-method configuration.
Leave the bogus results from pre-1.1.1 OpenSSL library bug while the fixed version is not in common use.
Diffstat (limited to 'test/src/client.c')
| -rw-r--r-- | test/src/client.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/test/src/client.c b/test/src/client.c index 3a6b4ad3d..de36ef065 100644 --- a/test/src/client.c +++ b/test/src/client.c @@ -569,12 +569,31 @@ nextinput: alarm(timeout); if (srv->tls_active) { - #ifdef HAVE_OPENSSL +#ifdef HAVE_OPENSSL + int error; rc = SSL_read(srv->ssl, inbuffer, bsiz - 1); - #endif - #ifdef HAVE_GNUTLS + if (rc <= 0) + switch (error = SSL_get_error(srv->ssl, rc)) + { + case SSL_ERROR_ZERO_RETURN: + break; + case SSL_ERROR_SYSCALL: + printf("%s\n", ERR_error_string(ERR_get_error(), NULL)); break; + rc = -1; + case SSL_ERROR_SSL: + printf("%s\n", ERR_error_string(ERR_get_error(), NULL)); break; + SSL_shutdown(srv->ssl); + SSL_free(srv->ssl); + srv->tls_active = FALSE; + goto nextinput; + default: + printf("SSL error code %d\n", error); + } + +#endif +#ifdef HAVE_GNUTLS rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1); - #endif +#endif } else rc = read(srv->sock, inbuffer, bsiz); @@ -591,6 +610,8 @@ nextinput: printf("Expected EOF read\n"); continue; } + else if (resp_optional) + continue; /* next scriptline */ else { printf("Unexpected EOF read\n"); |