summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2022-11-22 13:28:56 +0000
committerHugo Landau <hlandau@openssl.org>2023-01-19 13:17:39 +0000
commite30c502ae930295b889cce7375a83a8c742c68b4 (patch)
tree8a5e8813ddc41e9814ef3493c2225d6e0f2be1bb /ssl
parent4e392f601db9a5a131d0db8fa3fa2e3808d2770a (diff)
QUIC Front-End I/O API: Fix implementation of SSL_get_error
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19734)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 39a334c989..deb040e5ef 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -4411,6 +4411,14 @@ int SSL_get_error(const SSL *s, int i)
if (i > 0)
return SSL_ERROR_NONE;
+#ifndef OPENSSL_NO_QUIC
+ if (qc != NULL) {
+ reason = ossl_quic_get_error(qc, i);
+ if (reason != SSL_ERROR_NONE)
+ return reason;
+ }
+#endif
+
if (sc == NULL)
return SSL_ERROR_SSL;
@@ -4426,14 +4434,6 @@ int SSL_get_error(const SSL *s, int i)
}
#ifndef OPENSSL_NO_QUIC
- if (qc != NULL) {
- reason = ossl_quic_get_error(qc, i);
- if (reason != SSL_ERROR_NONE)
- return reason;
- }
-#endif
-
-#ifndef OPENSSL_NO_QUIC
if (qc == NULL)
#endif
{