fixed
This commit is contained in:
parent
de4223170b
commit
332c0ff43b
3 changed files with 31 additions and 31 deletions
28
C/irc.c
28
C/irc.c
|
@ -186,36 +186,33 @@ int IRCC_send(IRCC_client *irc, const char *channel, const char *msg) {
|
|||
|
||||
}
|
||||
|
||||
int IRCC_initssl(IRCC_client *irc, int *ircc_errno) {
|
||||
int IRCC_initssl(IRCC_client *irc) {
|
||||
#ifdef ENABLE_SSL
|
||||
irc->irc_ssl = NULL;
|
||||
irc->irc_sslctx = NULL;
|
||||
irc->irc_sslmethod = NULL;
|
||||
|
||||
OpenSSL_add_all_algorithms();
|
||||
|
||||
if (SSL_library_init() < 0) {
|
||||
*ircc_errno = IRCC_SSL_INIT;
|
||||
if (SSL_library_init() < 0)
|
||||
return IRCC_ERROR;
|
||||
}
|
||||
|
||||
irc->irc_sslmethod = (SSL_METHOD *)SSLv23_client_method();
|
||||
irc->irc_sslctx = SSL_CTX_new(irc->irc_sslmethod);
|
||||
if (irc->irc_sslctx == NULL) {
|
||||
*ircc_errno = IRCC_SSL_METHOD;
|
||||
if (irc->irc_sslctx == NULL)
|
||||
return IRCC_ERROR;
|
||||
}
|
||||
|
||||
SSL_CTX_set_options(irc->irc_sslctx, SSL_OP_NO_SSLv2);
|
||||
irc->irc_ssl = SSL_new(irc->irc_sslctx);
|
||||
|
||||
SSL_set_fd(irc->irc_ssl, irc->irc_socket);
|
||||
if (SSL_connect(irc->irc_ssl) != 1) {
|
||||
*ircc_errno = IRCC_SSL_SESSION;
|
||||
if (SSL_connect(irc->irc_ssl) != 1)
|
||||
return IRCC_ERROR;
|
||||
}
|
||||
|
||||
irc->irc_usingssl = 1;
|
||||
|
||||
#else
|
||||
(void)irc;
|
||||
*ircc_errno = 0;
|
||||
#endif
|
||||
|
||||
return IRCC_SUCCESS;
|
||||
|
@ -229,7 +226,12 @@ void IRCC_close(IRCC_client *irc) {
|
|||
if (!irc->irc_usingssl)
|
||||
return;
|
||||
|
||||
SSL_free(irc->irc_ssl);
|
||||
SSL_CTX_free(irc->irc_sslctx);
|
||||
if (irc->irc_ssl != NULL) {
|
||||
SSL_shutdown(irc->irc_ssl);
|
||||
SSL_free(irc->irc_ssl);
|
||||
}
|
||||
|
||||
if (irc->irc_sslctx != NULL)
|
||||
SSL_CTX_free(irc->irc_sslctx);
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue