Skip to content

Commit

Permalink
deps: Port BoringSSL QUIC APIs
Browse files Browse the repository at this point in the history
PR-URL: nodejs#138
Reviewed-By: Anna Henningsen <[email protected]>
  • Loading branch information
jasnell authored and juanarbol committed Dec 17, 2019
1 parent e14615d commit d148057
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
12 changes: 10 additions & 2 deletions deps/openssl/openssl/ssl/s3_msg.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,16 @@ int ssl3_dispatch_alert(SSL *s)

s->s3->alert_dispatch = 0;
alertlen = 2;
i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3->send_alert[0], &alertlen, 1, 0,
&written);
if (SSL_IS_QUIC(s)) {
if (!s->quic_method->send_alert(s, s->quic_write_level,
s->s3->send_alert[1])) {
SSLerr(SSL_F_SSL3_DISPATCH_ALERT, SSL_R_INTERNAL_ERROR);
return 0;
}
i = 1;
} else {
i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3->send_alert[0], &alertlen, 1, 0, &written);
}
if (i <= 0) {
s->s3->alert_dispatch = 1;
} else {
Expand Down
12 changes: 12 additions & 0 deletions deps/openssl/openssl/util/libssl.num
Original file line number Diff line number Diff line change
Expand Up @@ -498,3 +498,15 @@ SSL_CTX_get_recv_max_early_data 498 1_1_1 EXIST::FUNCTION:
SSL_CTX_set_recv_max_early_data 499 1_1_1 EXIST::FUNCTION:
SSL_CTX_set_post_handshake_auth 500 1_1_1 EXIST::FUNCTION:
SSL_get_signature_type_nid 501 1_1_1a EXIST::FUNCTION:
SSL_set_quic_transport_params 510 3_0_0 EXIST::FUNCTION:QUIC
SSL_get_peer_quic_transport_params 511 3_0_0 EXIST::FUNCTION:QUIC
SSL_quic_max_handshake_flight_len 512 3_0_0 EXIST::FUNCTION:QUIC
SSL_quic_read_level 513 3_0_0 EXIST::FUNCTION:QUIC
SSL_quic_write_level 514 3_0_0 EXIST::FUNCTION:QUIC
SSL_provide_quic_data 515 3_0_0 EXIST::FUNCTION:QUIC
SSL_CTX_set_quic_method 516 3_0_0 EXIST::FUNCTION:QUIC
SSL_set_quic_method 517 3_0_0 EXIST::FUNCTION:QUIC
SSL_process_quic_post_handshake 518 3_0_0 EXIST::FUNCTION:QUIC
SSL_CIPHER_get_prf_nid 519 3_0_0 EXIST::FUNCTION:
SSL_is_quic 520 3_0_0 EXIST::FUNCTION:QUIC
SSL_set_quic_early_data_enabled 521 3_0_0 EXIST::FUNCTION:QUIC

0 comments on commit d148057

Please sign in to comment.