Skip to content

Commit

Permalink
dovecot: Remove ssl-params
Browse files Browse the repository at this point in the history
  • Loading branch information
cmouse authored and GitLab committed Aug 11, 2016
1 parent 5b5da56 commit 00b722c
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 744 deletions.
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -904,7 +904,6 @@ src/pop3-login/Makefile
src/replication/Makefile
src/replication/aggregator/Makefile
src/replication/replicator/Makefile
src/ssl-params/Makefile
src/stats/Makefile
src/util/Makefile
src/plugins/Makefile
Expand Down
1 change: 0 additions & 1 deletion src/Makefile.am
Expand Up @@ -58,6 +58,5 @@ SUBDIRS = \
replication \
util \
doveadm \
ssl-params \
stats \
plugins
1 change: 0 additions & 1 deletion src/lib-ssl-iostream/Makefile.am
Expand Up @@ -21,7 +21,6 @@ libssl_iostream_openssl_la_SOURCES = \
iostream-openssl.c \
iostream-openssl-common.c \
iostream-openssl-context.c \
iostream-openssl-params.c \
istream-openssl.c \
ostream-openssl.c
endif
Expand Down
1 change: 0 additions & 1 deletion src/lib-ssl-iostream/iostream-openssl-context.c
Expand Up @@ -516,7 +516,6 @@ int openssl_iostream_context_init_server(const struct ssl_iostream_settings *set
void openssl_iostream_context_deinit(struct ssl_iostream_context *ctx)
{
SSL_CTX_free(ctx->ssl_ctx);
openssl_iostream_context_free_params(ctx);
pool_unref(&ctx->pool);
i_free(ctx);
}
Expand Down
132 changes: 0 additions & 132 deletions src/lib-ssl-iostream/iostream-openssl-params.c

This file was deleted.

3 changes: 0 additions & 3 deletions src/lib-ssl-iostream/iostream-openssl.c
Expand Up @@ -726,9 +726,6 @@ const struct iostream_ssl_vfuncs ssl_vfuncs = {
openssl_iostream_context_init_server,
openssl_iostream_context_deinit,

openssl_iostream_generate_params,
openssl_iostream_context_import_params,

openssl_iostream_create,
openssl_iostream_unref,
openssl_iostream_destroy,
Expand Down
6 changes: 0 additions & 6 deletions src/lib-ssl-iostream/iostream-openssl.h
Expand Up @@ -95,10 +95,4 @@ const char *
openssl_iostream_use_certificate_error(const char *cert, const char *set_name);
void openssl_iostream_clear_errors(void);

int openssl_iostream_generate_params(buffer_t *output, unsigned int dh_length,
const char **error_r);
int openssl_iostream_context_import_params(struct ssl_iostream_context *ctx,
const buffer_t *input);
void openssl_iostream_context_free_params(struct ssl_iostream_context *ctx);

#endif
5 changes: 0 additions & 5 deletions src/lib-ssl-iostream/iostream-ssl-private.h
Expand Up @@ -13,11 +13,6 @@ struct iostream_ssl_vfuncs {
const char **error_r);
void (*context_deinit)(struct ssl_iostream_context *ctx);

int (*generate_params)(buffer_t *output, unsigned int dh_length,
const char **error_r);
int (*context_import_params)(struct ssl_iostream_context *ctx,
const buffer_t *input);

int (*create)(struct ssl_iostream_context *ctx, const char *host,
const struct ssl_iostream_settings *set,
struct istream **input, struct ostream **output,
Expand Down
16 changes: 0 additions & 16 deletions src/lib-ssl-iostream/iostream-ssl.c
Expand Up @@ -81,22 +81,6 @@ void ssl_iostream_context_deinit(struct ssl_iostream_context **_ctx)
ssl_vfuncs->context_deinit(ctx);
}

int ssl_iostream_generate_params(buffer_t *output, unsigned int dh_length,
const char **error_r)
{
if (!ssl_module_loaded) {
if (ssl_module_load(error_r) < 0)
return -1;
}
return ssl_vfuncs->generate_params(output, dh_length, error_r);
}

int ssl_iostream_context_import_params(struct ssl_iostream_context *ctx,
const buffer_t *input)
{
return ssl_vfuncs->context_import_params(ctx, input);
}

int io_stream_create_ssl_client(struct ssl_iostream_context *ctx, const char *host,
const struct ssl_iostream_settings *set,
struct istream **input, struct ostream **output,
Expand Down
5 changes: 0 additions & 5 deletions src/lib-ssl-iostream/iostream-ssl.h
Expand Up @@ -65,11 +65,6 @@ const char *ssl_iostream_get_server_name(struct ssl_iostream *ssl_io);
const char *ssl_iostream_get_security_string(struct ssl_iostream *ssl_io);
const char *ssl_iostream_get_last_error(struct ssl_iostream *ssl_io);

int ssl_iostream_generate_params(buffer_t *output, unsigned int dh_length,
const char **error_r);
int ssl_iostream_context_import_params(struct ssl_iostream_context *ctx,
const buffer_t *input);

int ssl_iostream_context_init_client(const struct ssl_iostream_settings *set,
struct ssl_iostream_context **ctx_r,
const char **error_r);
Expand Down
22 changes: 0 additions & 22 deletions src/ssl-params/Makefile.am

This file was deleted.

0 comments on commit 00b722c

Please sign in to comment.