Forward port fixups from https://github.com/openssl/openssl/pull/24630 to master branch

[Neil Horman]

In backporting #24630 to 3.3, 2 fixups were identified that, while not critical, should be forward ported to master. This tracks that work.

Specifically:

• 373c5a2
• e96e9c3

[Neil Horman]

issue completed via forward cherry pick in #24630