From 70f1db321a2b39c75f679b5b052aa1ac0636bd50 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 28 Jul 2017 22:09:35 +0200 Subject: vtls: encapsulate SSL backend-specific data So far, all of the SSL backends' private data has been declared as part of the ssl_connect_data struct, in one big #if .. #elif .. #endif block. This can only work as long as the SSL backend is a compile-time option, something we want to change in the next commits. Therefore, let's encapsulate the exact data needed by each SSL backend into a private struct, and let's avoid bleeding any SSL backend-specific information into urldata.h. This is also necessary to allow multiple SSL backends to be compiled in at the same time, as e.g. OpenSSL's and CyaSSL's headers cannot be included in the same .c file. To avoid too many malloc() calls, we simply append the private structs to the connectdata struct in allocate_conn(). This requires us to take extra care of alignment issues: struct fields often need to be aligned on certain boundaries e.g. 32-bit values need to be stored at addresses that divide evenly by 4 (= 32 bit / 8 bit-per-byte). We do that by assuming that no SSL backend's private data contains any fields that need to be aligned on boundaries larger than `long long` (typically 64-bit) would need. Under this assumption, we simply add a dummy field of type `long long` to the `struct connectdata` struct. This field will never be accessed but acts as a placeholder for the four instances of ssl_backend_data instead. the size of each ssl_backend_data struct is stored in the SSL backend-specific metadata, to allow allocate_conn() to know how much extra space to allocate, and how to initialize the ssl[sockindex]->backend and proxy_ssl[sockindex]->backend pointers. This would appear to be a little complicated at first, but is really necessary to encapsulate the private data of each SSL backend correctly. And we need to encapsulate thusly if we ever want to allow selecting CyaSSL and OpenSSL at runtime, as their headers cannot be included within the same .c file (there are just too many conflicting definitions and declarations for that). Signed-off-by: Johannes Schindelin --- lib/vtls/vtls.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/vtls/vtls.h') diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index a814b72fb..e993fb77c 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -36,6 +36,8 @@ struct Curl_ssl { unsigned support_https_proxy:1; /* supports access via HTTPS proxies */ + size_t sizeof_ssl_backend_data; + int (*init)(void); void (*cleanup)(void); -- cgit v1.2.3