[openssl/openssl] 01fc81: Fix SSL_pending() and SSL_has_pending() with DTLS

Matt Caswell noreply at github.com
Wed Aug 17 15:46:02 UTC 2022


  Branch: refs/heads/OpenSSL_1_1_1-stable
  Home:   https://github.com/openssl/openssl
  Commit: 01fc812cb0aafc3cfc271303b6646d1c0a86b020
      https://github.com/openssl/openssl/commit/01fc812cb0aafc3cfc271303b6646d1c0a86b020
  Author: Matt Caswell <matt at openssl.org>
  Date:   2022-08-10 (Wed, 10 Aug 2022)

  Changed paths:
    M ssl/record/rec_layer_s3.c
    M ssl/ssl_lib.c

  Log Message:
  -----------
  Fix SSL_pending() and SSL_has_pending() with DTLS

If app data is received before a Finished message in DTLS then we buffer
it to return later. The function SSL_pending() is supposed to tell you
how much processed app data we have already buffered, and SSL_has_pending()
is supposed to tell you if we have any data buffered (whether processed or
not, and whether app data or not).

Neither SSL_pending() or SSL_has_pending() were taking account of this
DTLS specific app data buffer.

Reviewed-by: Hugo Landau <hlandau at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18976)


  Commit: d87e99df3162b2d56b8d44907fde88b67d7e3900
      https://github.com/openssl/openssl/commit/d87e99df3162b2d56b8d44907fde88b67d7e3900
  Author: Matt Caswell <matt at openssl.org>
  Date:   2022-08-10 (Wed, 10 Aug 2022)

  Changed paths:
    M test/dtlstest.c
    M test/ssltestlib.c
    M test/ssltestlib.h

  Log Message:
  -----------
  Test that swapping the first app data record with Finished msg works

If the first app data record arrives before the Finished message we should
be able to buffer it and move on to the Finished message.

Reviewed-by: Hugo Landau <hlandau at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18976)


Compare: https://github.com/openssl/openssl/compare/464883930047...d87e99df3162


More information about the openssl-commits mailing list