This makes it possible for the BIO callback to access these values,
instead of obtaining possibly mismatched values from packet_stream.
Restores behaviour prior to 5331506Closes#1996
Change-Id: I74ccb82f1739ca98eb033e68df4e27619ca7e46a
(cherry picked from commit 271b3b1520)
(cherry picked from commit f9fa687866)