From 227b2e99e98cd70fdbfc261c50845d3f71d58f5b Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Mon, 22 Jul 2019 16:50:36 +0200 Subject: quic: move patch for quicly 0.0.3 Change-Id: I58e58f1f297820b110013f4bf6ede827ced94a3d Type: fix Fixes: 5ff9765 Signed-off-by: Aloys Augustin --- ...function-ptr-in-ptls-ctx-for-aead_encrypt.patch | 33 ---------------------- ...function-ptr-in-ptls-ctx-for-aead_encrypt.patch | 33 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 build/external/patches/quicly_0.0.2-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch create mode 100644 build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch (limited to 'build') diff --git a/build/external/patches/quicly_0.0.2-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.2-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch deleted file mode 100644 index 80f3bcb684f..00000000000 --- a/build/external/patches/quicly_0.0.2-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h -index 06d62f9..de33b86 100644 ---- a/deps/picotls/include/picotls.h -+++ b/deps/picotls/include/picotls.h -@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { - size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); - size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, - const void *aad, size_t aadlen); -+ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, -+ const void *iv, const void *aad, size_t aadlen); - } ptls_aead_context_t; - - /** -diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c -index 70d2fef..f98f7b4 100644 ---- a/deps/picotls/lib/picotls.c -+++ b/deps/picotls/lib/picotls.c -@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp - { - size_t off = 0; - -+ if(ctx->do_encrypt) -+ { -+ uint8_t iv[PTLS_MAX_IV_SIZE]; -+ ptls_aead__build_iv(ctx, iv, seq); -+ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); -+ } -+ - ptls_aead_encrypt_init(ctx, seq, aad, aadlen); - off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); - off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); - - diff --git a/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch b/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch new file mode 100644 index 00000000000..80f3bcb684f --- /dev/null +++ b/build/external/patches/quicly_0.0.3-vpp/0001-Add-function-ptr-in-ptls-ctx-for-aead_encrypt.patch @@ -0,0 +1,33 @@ +diff --git a/deps/picotls/include/picotls.h b/deps/picotls/include/picotls.h +index 06d62f9..de33b86 100644 +--- a/deps/picotls/include/picotls.h ++++ b/deps/picotls/include/picotls.h +@@ -276,6 +276,8 @@ typedef struct st_ptls_aead_context_t { + size_t (*do_encrypt_final)(struct st_ptls_aead_context_t *ctx, void *output); + size_t (*do_decrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, const void *iv, + const void *aad, size_t aadlen); ++ size_t (*do_encrypt)(struct st_ptls_aead_context_t *ctx, void *output, const void *input, size_t inlen, uint64_t seq, ++ const void *iv, const void *aad, size_t aadlen); + } ptls_aead_context_t; + + /** +diff --git a/deps/picotls/lib/picotls.c b/deps/picotls/lib/picotls.c +index 70d2fef..f98f7b4 100644 +--- a/deps/picotls/lib/picotls.c ++++ b/deps/picotls/lib/picotls.c +@@ -4890,6 +4890,13 @@ size_t ptls_aead_encrypt(ptls_aead_context_t *ctx, void *output, const void *inp + { + size_t off = 0; + ++ if(ctx->do_encrypt) ++ { ++ uint8_t iv[PTLS_MAX_IV_SIZE]; ++ ptls_aead__build_iv(ctx, iv, seq); ++ return ctx->do_encrypt(ctx, output, input, inlen, seq, iv, aad, aadlen); ++ } ++ + ptls_aead_encrypt_init(ctx, seq, aad, aadlen); + off += ptls_aead_encrypt_update(ctx, ((uint8_t *)output) + off, input, inlen); + off += ptls_aead_encrypt_final(ctx, ((uint8_t *)output) + off); + + -- cgit 1.2.3-korg