]> git.kaiwu.me - nginx.git/commitdiff
QUIC: converted to SSL_CIPHER_get_protocol_id().
authorSergey Kandaurov <pluknet@nginx.com>
Mon, 21 Dec 2020 12:05:43 +0000 (15:05 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Mon, 21 Dec 2020 12:05:43 +0000 (15:05 +0300)
This API is available in BoringSSL for quite some time:
https://boringssl.googlesource.com/boringssl/+/3743aaf

src/event/ngx_event_quic_protection.c

index db9068d69721e6533be0d80bb31f216e0c635ad2..401b71121982add82c2eb3d69ea1dd02fc95af70 100644 (file)
@@ -655,11 +655,7 @@ int ngx_quic_keys_set_encryption_secret(ngx_pool_t *pool, ngx_uint_t is_write,
     peer_secret = is_write ? &keys->secrets[level].server
                            : &keys->secrets[level].client;
 
-    /*
-     * SSL_CIPHER_get_protocol_id() is not universally available,
-     * casting to uint16_t works for both OpenSSL and BoringSSL
-     */
-    keys->cipher = (uint16_t) SSL_CIPHER_get_id(cipher);
+    keys->cipher = SSL_CIPHER_get_protocol_id(cipher);
 
     key_len = ngx_quic_ciphers(keys->cipher, &ciphers, level);