diff options
| author |   Mathias Raoul <mathias.raoul@gmail.com> | 2021-04-02 18:02:24 +0000 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2021-04-22 00:52:15 +0000 |
| commit | db36fda74ece376cd31ca374841e7ca17c06a34c (patch) | |
| tree | 50b5c7b3490526cbbe0c6740fb1538917a09f66c /src | |
| parent | 9292c32b4579a1da2e851fe5ca7de3415b45fc07 (diff) | |
quic: update quicly to v0.1.3
This bumps quicly version to v0.1.3 ( sha
d44c089364067dbcdfbad7fb2c821900fb4aef5e in
https://github.com/h2o/quicly )
Also simplifies the build to only make needed
dependancies, and silence compiletime warnings
Type: feature
Change-Id: Ie00ec7e408d234464871b68ddc79bb33dc4179ed
Signed-off-by: Mathias Raoul <mathias.raoul@gmail.com>
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/quic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/quic/quic_crypto.c | 4 | ||||
| -rw-r--r-- | src/plugins/tlspicotls/pico_vpp_crypto.c | 21 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/plugins/quic/CMakeLists.txt b/src/plugins/quic/CMakeLists.txt index 35d72c21685..044186b3ae6 100644 --- a/src/plugins/quic/CMakeLists.txt +++ b/src/plugins/quic/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. unset(QUIC_LINK_LIBRARIES) -set(EXPECTED_QUICLY_VERSION "0.1.2-vpp") +set(EXPECTED_QUICLY_VERSION "0.1.3-vpp") find_path(QUICLY_INCLUDE_DIR NAMES quicly.h) find_path(PICOTLS_INCLUDE_DIR NAMES picotls.h) diff --git a/src/plugins/quic/quic_crypto.c b/src/plugins/quic/quic_crypto.c index 15e5f0d52fb..05211cd310d 100644 --- a/src/plugins/quic/quic_crypto.c +++ b/src/plugins/quic/quic_crypto.c @@ -470,6 +470,8 @@ ptls_cipher_algorithm_t quic_crypto_aes256ctr = { ptls_aead_algorithm_t quic_crypto_aes128gcm = { "AES128-GCM", + PTLS_AESGCM_CONFIDENTIALITY_LIMIT, + PTLS_AESGCM_INTEGRITY_LIMIT, &quic_crypto_aes128ctr, &ptls_openssl_aes128ecb, PTLS_AES128_KEY_SIZE, @@ -481,6 +483,8 @@ ptls_aead_algorithm_t quic_crypto_aes128gcm = { ptls_aead_algorithm_t quic_crypto_aes256gcm = { "AES256-GCM", + PTLS_AESGCM_CONFIDENTIALITY_LIMIT, + PTLS_AESGCM_INTEGRITY_LIMIT, &quic_crypto_aes256ctr, &ptls_openssl_aes256ecb, PTLS_AES256_KEY_SIZE, diff --git a/src/plugins/tlspicotls/pico_vpp_crypto.c b/src/plugins/tlspicotls/pico_vpp_crypto.c index 3805ff3c981..049b05139d8 100644 --- a/src/plugins/tlspicotls/pico_vpp_crypto.c +++ b/src/plugins/tlspicotls/pico_vpp_crypto.c @@ -290,22 +290,28 @@ ptls_vpp_crypto_aead_aes256gcm_setup_crypto (ptls_aead_context_t *ctx, VNET_CRYPTO_ALG_AES_256_GCM); } -ptls_cipher_algorithm_t ptls_vpp_crypto_aes128ctr = { "AES128-CTR", +ptls_cipher_algorithm_t ptls_vpp_crypto_aes128ctr = { + "AES128-CTR", PTLS_AES128_KEY_SIZE, - 1, PTLS_AES_IV_SIZE, + 1, + PTLS_AES_IV_SIZE, sizeof (struct vpp_aead_context_t), ptls_vpp_crypto_aes128ctr_setup_crypto }; -ptls_cipher_algorithm_t ptls_vpp_crypto_aes256ctr = { "AES256-CTR", +ptls_cipher_algorithm_t ptls_vpp_crypto_aes256ctr = { + "AES256-CTR", PTLS_AES256_KEY_SIZE, - 1 /* block size */ , + 1 /* block size */, PTLS_AES_IV_SIZE, sizeof (struct vpp_aead_context_t), ptls_vpp_crypto_aes256ctr_setup_crypto }; -ptls_aead_algorithm_t ptls_vpp_crypto_aes128gcm = { "AES128-GCM", +ptls_aead_algorithm_t ptls_vpp_crypto_aes128gcm = { + "AES128-GCM", + PTLS_AESGCM_CONFIDENTIALITY_LIMIT, + PTLS_AESGCM_INTEGRITY_LIMIT, &ptls_vpp_crypto_aes128ctr, NULL, PTLS_AES128_KEY_SIZE, @@ -315,7 +321,10 @@ ptls_aead_algorithm_t ptls_vpp_crypto_aes128gcm = { "AES128-GCM", ptls_vpp_crypto_aead_aes128gcm_setup_crypto }; -ptls_aead_algorithm_t ptls_vpp_crypto_aes256gcm = { "AES256-GCM", +ptls_aead_algorithm_t ptls_vpp_crypto_aes256gcm = { + "AES256-GCM", + PTLS_AESGCM_CONFIDENTIALITY_LIMIT, + PTLS_AESGCM_INTEGRITY_LIMIT, &ptls_vpp_crypto_aes256ctr, NULL, PTLS_AES256_KEY_SIZE, |