From 7a1eb730b1fff7b49def2b86730642cbe0f74d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Wennerstr=C3=B6m?= Date: Tue, 21 Jul 2020 09:48:22 +0200 Subject: [PATCH] Explicitly clear fragment from HTTP URL --- src/omemo/omemo.c | 6 ++++++ src/omemo/omemo.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/omemo/omemo.c b/src/omemo/omemo.c index 8b426320..2e698591 100644 --- a/src/omemo/omemo.c +++ b/src/omemo/omemo.c @@ -1767,6 +1767,12 @@ omemo_parse_aesgcm_url(const char* aesgcm_url, goto out; } + // Clear fragment from HTTPS URL as it's not required for download. + ret = curl_url_set(url, CURLUPART_FRAGMENT, NULL, curl_flags); + if (ret) { + goto out; + } + ret = curl_url_set(url, CURLUPART_SCHEME, "https", curl_flags); if (ret) { goto out; diff --git a/src/omemo/omemo.h b/src/omemo/omemo.h index d90f11cf..b8d84498 100644 --- a/src/omemo/omemo.h +++ b/src/omemo/omemo.h @@ -101,5 +101,6 @@ char* omemo_on_message_send(ProfWin* win, const char* const message, gboolean re char* omemo_on_message_recv(const char* const from, uint32_t sid, const unsigned char* const iv, size_t iv_len, GList* keys, const unsigned char* const payload, size_t payload_len, gboolean muc, gboolean* trusted); char* omemo_encrypt_file(FILE* in, FILE* out, off_t file_size, int* gcry_res); -gcry_error_t omemo_decrypt_file(FILE* in, FILE* out, off_t file_size, const char* fragment); void omemo_free(void* a); +gcry_error_t omemo_decrypt_file(FILE* in, FILE* out, off_t file_size, const char* fragment); +void omemo_free(void* a); int omemo_parse_aesgcm_url(const char* aesgcm_url, char** https_url, char** fragment);