From 78dd67613baa002fbfad465d471a0a216d5a501a Mon Sep 17 00:00:00 2001 From: Janos SUTO Date: Sat, 3 Nov 2018 15:19:08 +0100 Subject: [PATCH] Fixed init_ssl() name to init_ssl_to_server() Signed-off-by: Janos SUTO --- src/imap.c | 2 +- src/misc.c | 2 +- src/misc.h | 2 +- src/pop3.c | 2 +- unit_tests/smtp.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imap.c b/src/imap.c index c29f3a75..2e611418 100644 --- a/src/imap.c +++ b/src/imap.c @@ -96,7 +96,7 @@ int connect_to_imap_server(struct data *data){ data->import->cap_uidplus = 0; if(data->net->use_ssl == 1){ - init_ssl(data); + init_ssl_to_server(data); } diff --git a/src/misc.c b/src/misc.c index f7cb6d7d..d934b40c 100644 --- a/src/misc.c +++ b/src/misc.c @@ -730,7 +730,7 @@ int read_one_line(char *s, int c, char *buf, int buflen, int *rc){ } -int init_ssl(struct data *data){ +int init_ssl_to_server(struct data *data){ int n; X509* server_cert; char *str; diff --git a/src/misc.h b/src/misc.h index 2dc7d191..96481063 100644 --- a/src/misc.h +++ b/src/misc.h @@ -51,7 +51,7 @@ int can_i_write_directory(char *dir); void move_email(struct smtp_session *session); int read_one_line(char *s, int c, char *buf, int buflen, int *rc); -int init_ssl(struct data *data); +int init_ssl_to_server(struct data *data); #ifndef _GNU_SOURCE char *strcasestr(const char *s, const char *find); diff --git a/src/pop3.c b/src/pop3.c index 456d2b1c..ec3a5e2c 100644 --- a/src/pop3.c +++ b/src/pop3.c @@ -37,7 +37,7 @@ int connect_to_pop3_server(struct data *data){ char buf[MAXBUFSIZE]; if(data->net->use_ssl == 1){ - init_ssl(data); + init_ssl_to_server(data); } recvtimeoutssl(data->net, buf, sizeof(buf)); diff --git a/unit_tests/smtp.c b/unit_tests/smtp.c index 82b3328e..2c7fd3c4 100644 --- a/unit_tests/smtp.c +++ b/unit_tests/smtp.c @@ -241,7 +241,7 @@ static void test_smtp_commands_starttls(char *server, int port, struct data *dat send_smtp_command(data->net, "STARTTLS\r\n", recvbuf, sizeof(recvbuf)-1); assert(strncmp(recvbuf, "220 ", 4) == 0 && "STARTTLS"); - init_ssl(data); + init_ssl_to_server(data); data->net->use_ssl = 1; send_helo_command(data->net);