Merge remote-tracking branch 'public/pr/2127' into development-restricted-proposed

This commit is contained in:
Simon Butcher 2018-11-07 12:57:01 +00:00
commit 361ce6c302
2 changed files with 9 additions and 6 deletions

View File

@ -78,6 +78,8 @@ Changes
rejected in some applications, e.g. some versions of Firefox, curl rejected in some applications, e.g. some versions of Firefox, curl
and GnuTLS. Reported in #1033 by Moschn. Fix contributed by and GnuTLS. Reported in #1033 by Moschn. Fix contributed by
Thomas-Dee in #1641. Thomas-Dee in #1641.
* Improve documentation of mbedtls_ssl_get_verify_result().
Fixes #517 reported by github-monoculture.
= mbed TLS 2.13.1 branch released 2018-09-06 = mbed TLS 2.13.1 branch released 2018-09-06

View File

@ -2774,13 +2774,14 @@ size_t mbedtls_ssl_get_bytes_avail( const mbedtls_ssl_context *ssl );
/** /**
* \brief Return the result of the certificate verification * \brief Return the result of the certificate verification
* *
* \param ssl SSL context * \param ssl The SSL context to use.
* *
* \return 0 if successful, * \return \c 0 if the certificate verification was successful.
* -1 if result is not available (eg because the handshake was * \return \c -1u if the result is not available. This may happen
* aborted too early), or * e.g. if the handshake aborts early, or a verification
* a combination of BADCERT_xxx and BADCRL_xxx flags, see * callback returned a fatal error.
* x509.h * \return A bitwise combination of \c MBEDTLS_X509_BADCERT_XXX
* and \c MBEDTLS_X509_BADCRL_XXX failure flags; see x509.h.
*/ */
uint32_t mbedtls_ssl_get_verify_result( const mbedtls_ssl_context *ssl ); uint32_t mbedtls_ssl_get_verify_result( const mbedtls_ssl_context *ssl );