diff options
Diffstat (limited to 'src/microhttpd/internal.h')
| -rw-r--r-- | src/microhttpd/internal.h | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h index 286aee68..fa751be9 100644 --- a/src/microhttpd/internal.h +++ b/src/microhttpd/internal.h @@ -31,10 +31,7 @@ #include "microhttpd.h" #include "platform_interface.h" #if HTTPS_SUPPORT -#include <gnutls/gnutls.h> -#if GNUTLS_VERSION_MAJOR >= 3 -#include <gnutls/abstract.h> -#endif +#include <openssl/ssl.h> #endif #if EPOLL_SUPPORT #include <sys/epoll.h> @@ -841,17 +838,17 @@ struct MHD_Connection /** * State required for HTTPS/SSL/TLS support. */ - gnutls_session_t tls_session; + SSL* tls_session; /** * Memory location to return for protocol session info. */ - int protocol; + const char* protocol; /** * Memory location to return for protocol session info. */ - int cipher; + const char* cipher; /** * Could it be that we are ready to read due to TLS buffers @@ -1193,42 +1190,14 @@ struct MHD_Daemon uint16_t port; #if HTTPS_SUPPORT + SSL_CTX* tls_context; /** - * Desired cipher algorithms. - */ - gnutls_priority_t priority_cache; - - /** - * What kind of credentials are we offering - * for SSL/TLS? - */ - gnutls_credentials_type_t cred_type; - - /** - * Server x509 credentials - */ - gnutls_certificate_credentials_t x509_cred; - - /** - * Diffie-Hellman parameters - */ - gnutls_dh_params_t dh_params; - -#if GNUTLS_VERSION_MAJOR >= 3 - /** - * Function that can be used to obtain the certificate. Needed - * for SNI support. See #MHD_OPTION_HTTPS_CERT_CALLBACK. - */ - gnutls_certificate_retrieve_function2 *cert_callback; -#endif - - /** - * Pointer to our SSL/TLS key (in ASCII) in memory. + * Pointer to our SSL/TLS key (in PEM) in memory. */ const char *https_mem_key; /** - * Pointer to our SSL/TLS certificate (in ASCII) in memory. + * Pointer to our SSL/TLS certificate (in PEM) in memory. */ const char *https_mem_cert; @@ -1238,19 +1207,19 @@ struct MHD_Daemon const char *https_key_password; /** - * Pointer to our SSL/TLS certificate authority (in ASCII) in memory. + * Pointer to our SSL/TLS certificate authority (in PEM) in memory. */ const char *https_mem_trust; /** - * Our Diffie-Hellman parameters in memory. + * Our Diffie-Hellman parameters (in PEM) in memory. */ - gnutls_dh_params_t https_mem_dhparams; + const char *https_mem_dhparams; /** - * #MHD_YES if we have initialized @e https_mem_dhparams. + * Pointer to SSL/TLS cipher string in memory. */ - int have_dhparams; + const char *https_mem_cipher; /** * For how many connections do we have 'tls_read_ready' set to MHD_YES? |