diff options
| author | David Benjamin <davidben@google.com> | 2018-05-20 17:24:30 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2018-05-23 17:34:54 -0400 |
| commit | 2de108dfa343c3e06eb98beb122cd06306bb12fd (patch) | |
| tree | 3e49b8444a3c29a076eac36a126b77d7891d2f5b /test/build.info | |
| parent | e363534cfe0ae01503dde6963e0631ec5f7fef3f (diff) | |
Save and restore the Windows error around TlsGetValue.
TlsGetValue clears the last error even on success, so that callers may
distinguish it successfully returning NULL or failing. This error-mangling
behavior interferes with the caller's use of GetLastError. In particular
SSL_get_error queries the error queue to determine whether the caller should
look at the OS's errors. To avoid destroying state, save and restore the
Windows error.
Fixes #6299.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6316)
Diffstat (limited to 'test/build.info')
| -rw-r--r-- | test/build.info | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/build.info b/test/build.info index c3a09048b5..000153d510 100644 --- a/test/build.info +++ b/test/build.info @@ -51,7 +51,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN recordlentest drbgtest drbg_cavs_test sslbuffertest \ time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \ servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \ - sysdefaulttest + sysdefaulttest errtest SOURCE[versions]=versions.c INCLUDE[versions]=../include @@ -535,6 +535,10 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN SOURCE[sysdefaulttest]=sysdefaulttest.c INCLUDE[sysdefaulttest]=../include DEPEND[sysdefaulttest]=../libcrypto ../libssl libtestutil.a + + SOURCE[errtest]=errtest.c + INCLUDE[errtest]=../include + DEPEND[errtest]=../libcrypto libtestutil.a ENDIF {- |