diff options
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 93c0b00bb5..c3a7882a5b 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -609,7 +609,6 @@ int ossl_ssl_connection_reset(SSL *s) ossl_statem_clear(sc); - /* TODO(QUIC): Version handling not yet clear */ sc->version = s->method->version; sc->client_version = sc->version; sc->rwstate = SSL_NOTHING; @@ -1997,7 +1996,7 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s) int SSL_copy_session_id(SSL *t, const SSL *f) { int i; - /* TODO(QUIC): Not allowed for QUIC currently. */ + /* TODO(QUIC FUTURE): Not allowed for QUIC currently. */ SSL_CONNECTION *tsc = SSL_CONNECTION_FROM_SSL_ONLY(t); const SSL_CONNECTION *fsc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(f); @@ -2654,7 +2653,7 @@ int SSL_write_early_data(SSL *s, const void *buf, size_t num, size_t *written) uint32_t partialwrite; SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); - /* TODO(QUIC): This will need special handling for QUIC */ + /* TODO(QUIC 0RTT): This will need special handling for QUIC */ if (sc == NULL) return 0; @@ -2904,7 +2903,7 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) long l; SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - /* TODO(QUIC): Special handling for some ctrls will be needed */ + /* TODO(QUIC FUTURE): Special handling for some ctrls will be needed */ if (sc == NULL) return 0; @@ -4873,7 +4872,7 @@ SSL *SSL_dup(SSL *s) { SSL *ret; int i; - /* TODO(QUIC): Add a SSL_METHOD function for duplication */ + /* TODO(QUIC FUTURE): Add a SSL_METHOD function for duplication */ SSL_CONNECTION *retsc; SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); @@ -5174,7 +5173,6 @@ int SSL_version(const SSL *s) if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return OSSL_QUIC1_VERSION; #endif - /* TODO(QUIC): Do we want to report QUIC version this way instead? */ if (sc == NULL) return 0; @@ -5185,7 +5183,11 @@ int SSL_client_version(const SSL *s) { const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); - /* TODO(QUIC): Do we want to report QUIC version this way instead? */ +#ifndef OPENSSL_NO_QUIC + /* We only support QUICv1 - so if its QUIC its QUICv1 */ + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return OSSL_QUIC1_VERSION; +#endif if (sc == NULL) return 0; @@ -5202,7 +5204,7 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx) CERT *new_cert; SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl); - /* TODO(QUIC): Do we need this for QUIC support? */ + /* TODO(QUIC FUTURE): Add support for QUIC */ if (sc == NULL) return NULL; |