diff --git a/tls/openssl/gtlsclientconnection-openssl.c b/tls/openssl/gtlsclientconnection-openssl.c index 2a16f6e0a470ca7a257727bf799d28ec9397ca8a..e72cee477b0a051717c32400e37f7e7681007800 100644 --- a/tls/openssl/gtlsclientconnection-openssl.c +++ b/tls/openssl/gtlsclientconnection-openssl.c @@ -280,17 +280,6 @@ g_tls_client_connection_openssl_get_ssl (GTlsConnectionOpenssl *connection) return priv->ssl; } -static SSL_CTX * -g_tls_client_connection_openssl_get_ssl_ctx (GTlsConnectionOpenssl *connection) -{ - GTlsClientConnectionOpenssl *client = G_TLS_CLIENT_CONNECTION_OPENSSL (connection); - GTlsClientConnectionOpensslPrivate *priv; - - priv = g_tls_client_connection_openssl_get_instance_private (client); - - return priv->ssl_ctx; -} - static void g_tls_client_connection_openssl_class_init (GTlsClientConnectionOpensslClass *klass) { @@ -307,7 +296,6 @@ g_tls_client_connection_openssl_class_init (GTlsClientConnectionOpensslClass *kl base_class->complete_handshake = g_tls_client_connection_openssl_complete_handshake; connection_class->get_ssl = g_tls_client_connection_openssl_get_ssl; - connection_class->get_ssl_ctx = g_tls_client_connection_openssl_get_ssl_ctx; g_object_class_override_property (gobject_class, PROP_VALIDATION_FLAGS, "validation-flags"); g_object_class_override_property (gobject_class, PROP_SERVER_IDENTITY, "server-identity"); diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c index 9b4b9b408feefe61b961db236d2b4898570be370..622d40353a314095625d200f9b18d186df39a2df 100644 --- a/tls/openssl/gtlsconnection-openssl.c +++ b/tls/openssl/gtlsconnection-openssl.c @@ -620,14 +620,6 @@ g_tls_connection_openssl_get_ssl (GTlsConnectionOpenssl *openssl) return G_TLS_CONNECTION_OPENSSL_GET_CLASS (openssl)->get_ssl (openssl); } -SSL_CTX * -g_tls_connection_openssl_get_ssl_ctx (GTlsConnectionOpenssl *openssl) -{ - g_return_val_if_fail (G_IS_TLS_CONNECTION_OPENSSL (openssl), NULL); - - return G_TLS_CONNECTION_OPENSSL_GET_CLASS (openssl)->get_ssl_ctx (openssl); -} - gboolean g_tls_connection_openssl_request_certificate (GTlsConnectionOpenssl *openssl, GError **error) diff --git a/tls/openssl/gtlsconnection-openssl.h b/tls/openssl/gtlsconnection-openssl.h index 31eeab3cd0b5040965cac40dca1a5a4edf5eeaac..99eff4710b43f5bc67befae6efeaa095c8eb7330 100644 --- a/tls/openssl/gtlsconnection-openssl.h +++ b/tls/openssl/gtlsconnection-openssl.h @@ -46,8 +46,7 @@ struct _GTlsConnectionOpensslClass { GTlsConnectionBaseClass parent_class; - SSL *(*get_ssl) (GTlsConnectionOpenssl *connection); - SSL_CTX *(*get_ssl_ctx) (GTlsConnectionOpenssl *connection); + SSL *(*get_ssl) (GTlsConnectionOpenssl *connection); }; struct _GTlsConnectionOpenssl @@ -57,8 +56,7 @@ struct _GTlsConnectionOpenssl GType g_tls_connection_openssl_get_type (void) G_GNUC_CONST; -SSL *g_tls_connection_openssl_get_ssl (GTlsConnectionOpenssl *connection); -SSL_CTX *g_tls_connection_openssl_get_ssl_ctx (GTlsConnectionOpenssl *connection); +SSL *g_tls_connection_openssl_get_ssl (GTlsConnectionOpenssl *connection); gboolean g_tls_connection_openssl_request_certificate (GTlsConnectionOpenssl *openssl, GError **error); diff --git a/tls/openssl/gtlsserverconnection-openssl.c b/tls/openssl/gtlsserverconnection-openssl.c index e5307de5a6359ecadfd8bfe8a54cb64af044b8f3..60f965923428f62ac330d6e384c125848a36b53a 100644 --- a/tls/openssl/gtlsserverconnection-openssl.c +++ b/tls/openssl/gtlsserverconnection-openssl.c @@ -168,17 +168,6 @@ g_tls_server_connection_openssl_get_ssl (GTlsConnectionOpenssl *connection) return priv->ssl; } -static SSL_CTX * -g_tls_server_connection_openssl_get_ssl_ctx (GTlsConnectionOpenssl *connection) -{ - GTlsServerConnectionOpenssl *server = G_TLS_SERVER_CONNECTION_OPENSSL (connection); - GTlsServerConnectionOpensslPrivate *priv; - - priv = g_tls_server_connection_openssl_get_instance_private (server); - - return priv->ssl_ctx; -} - static void g_tls_server_connection_openssl_class_init (GTlsServerConnectionOpensslClass *klass) { @@ -193,7 +182,6 @@ g_tls_server_connection_openssl_class_init (GTlsServerConnectionOpensslClass *kl base_class->handshake = g_tls_server_connection_openssl_handshake; connection_class->get_ssl = g_tls_server_connection_openssl_get_ssl; - connection_class->get_ssl_ctx = g_tls_server_connection_openssl_get_ssl_ctx; g_object_class_override_property (gobject_class, PROP_AUTHENTICATION_MODE, "authentication-mode"); }