9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m_starttls: handle error condition with ERR_STARTTLS (691) numeric per tls-3.2 specification

Browse source
This commit is contained in:
William Pitcock 2012-09-22 19:31:55 -05:00
parent 21f715a9a3
commit c4e81ae9e9
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/numeric.h
View file

@ -319,6 +319,8 @@ extern const char *form_str(int);
#define RPL_STARTTLS 670 /* ircv3.atheme.org tls-3.1 */ #define RPL_STARTTLS 670 /* ircv3.atheme.org tls-3.1 */
#define RPL_WHOISSECURE 671 /* Unreal3.2 --nenolod */ #define RPL_WHOISSECURE 671 /* Unreal3.2 --nenolod */
#define ERR_STARTTLS 691 /* ircv3.atheme.org tls-3.2 */
#define RPL_MODLIST 702 #define RPL_MODLIST 702
#define RPL_ENDOFMODLIST 703 #define RPL_ENDOFMODLIST 703

1
modules/m_starttls.c
View file

@ -54,6 +54,7 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
if (rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &F[0], &F[1], "STARTTLS ssld session") == -1) if (rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &F[0], &F[1], "STARTTLS ssld session") == -1)
{ {
ilog_error("error creating SSL/TLS socketpair for ssld slave"); ilog_error("error creating SSL/TLS socketpair for ssld slave");
sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "Unable to create SSL/TLS socketpair for ssld offload slave");
return 1; return 1;
} }

2
src/messages.tab
View file

@ -716,7 +716,7 @@ static const char * replies[] = {
/* 688 */ NULL, /* 688 */ NULL,
/* 689 */ NULL, /* 689 */ NULL,
/* 690 */ NULL, /* 690 */ NULL,
/* 691 */ NULL, /* 691 ERR_STARTTLS */ ":%s",
/* 692 */ NULL, /* 692 */ NULL,
/* 693 */ NULL, /* 693 */ NULL,
/* 694 */ NULL, /* 694 */ NULL,