jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

fix comments

Browse Source
This commit is contained in:
ailin-nemui 2017-11-30 11:15:47 +01:00
parent b2ca8c0477
commit b332d448f7
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ignore.h
View File

@ -27,14 +27,14 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
const char *channel, const char *text, int level); const char *channel, const char *text, int level);
enum { enum {
IGNORE_FIND_PATTERN = 0x01, // Match the pattern IGNORE_FIND_PATTERN = 0x01, /* Match the pattern */
IGNORE_FIND_NOACT = 0x02, // Exclude the targets with NOACT level IGNORE_FIND_NOACT = 0x02, /* Exclude the targets with NOACT level */
}; };
IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern, IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
char **channels, const int flags); char **channels, const int flags);
// Convenience wrappers around ignore_find_full, for compatibility purpose /* Convenience wrappers around ignore_find_full, for compatibility purpose */
IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels); IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact); IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);

20
src/core/network-openssl.c
View File

@ -600,7 +600,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
tls_rec_set_certificate_fingerprint(tls, cert_fingerprint_hex); tls_rec_set_certificate_fingerprint(tls, cert_fingerprint_hex);
tls_rec_set_certificate_fingerprint_algorithm(tls, "SHA256"); tls_rec_set_certificate_fingerprint_algorithm(tls, "SHA256");
// Show algorithm. /* Show algorithm. */
switch (EVP_PKEY_id(pubkey)) { switch (EVP_PKEY_id(pubkey)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
tls_rec_set_public_key_algorithm(tls, "RSA"); tls_rec_set_public_key_algorithm(tls, "RSA");
@ -624,7 +624,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
tls_rec_set_public_key_size(tls, EVP_PKEY_bits(pubkey)); tls_rec_set_public_key_size(tls, EVP_PKEY_bits(pubkey));
tls_rec_set_public_key_fingerprint_algorithm(tls, "SHA256"); tls_rec_set_public_key_fingerprint_algorithm(tls, "SHA256");
// Read the NotBefore timestamp. /* Read the NotBefore timestamp. */
bio = BIO_new(BIO_s_mem()); bio = BIO_new(BIO_s_mem());
ASN1_TIME_print(bio, X509_get_notBefore(cert)); ASN1_TIME_print(bio, X509_get_notBefore(cert));
length = BIO_read(bio, buffer, sizeof(buffer)); length = BIO_read(bio, buffer, sizeof(buffer));
@ -632,7 +632,7 @@ static void set_pubkey_info(TLS_REC *tls, X509 *cert, unsigned char *cert_finger
BIO_free(bio); BIO_free(bio);
tls_rec_set_not_before(tls, buffer); tls_rec_set_not_before(tls, buffer);
// Read the NotAfter timestamp. /* Read the NotAfter timestamp. */
bio = BIO_new(BIO_s_mem()); bio = BIO_new(BIO_s_mem());
ASN1_TIME_print(bio, X509_get_notAfter(cert)); ASN1_TIME_print(bio, X509_get_notAfter(cert));
length = BIO_read(bio, buffer, sizeof(buffer)); length = BIO_read(bio, buffer, sizeof(buffer));
@ -670,7 +670,7 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
for (i = 0; i < sk_X509_num(chain); i++) { for (i = 0; i < sk_X509_num(chain); i++) {
cert_rec = tls_cert_create_rec(); cert_rec = tls_cert_create_rec();
// Subject. /* Subject. */
name = X509_get_subject_name(sk_X509_value(chain, i)); name = X509_get_subject_name(sk_X509_value(chain, i));
for (j = 0; j < X509_NAME_entry_count(name); j++) { for (j = 0; j < X509_NAME_entry_count(name); j++) {
@ -689,7 +689,7 @@ static void set_peer_cert_chain_info(TLS_REC *tls, SSL *ssl)
tls_cert_rec_append_subject_entry(cert_rec, tls_cert_entry_rec); tls_cert_rec_append_subject_entry(cert_rec, tls_cert_entry_rec);
} }
// Issuer. /* Issuer. */
name = X509_get_issuer_name(sk_X509_value(chain, i)); name = X509_get_issuer_name(sk_X509_value(chain, i));
for (j = 0; j < X509_NAME_entry_count(name); j++) { for (j = 0; j < X509_NAME_entry_count(name); j++) {
@ -718,10 +718,10 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
g_return_if_fail(ssl != NULL); g_return_if_fail(ssl != NULL);
#ifdef SSL_get_server_tmp_key #ifdef SSL_get_server_tmp_key
// Show ephemeral key information. /* Show ephemeral key information. */
EVP_PKEY *ephemeral_key = NULL; EVP_PKEY *ephemeral_key = NULL;
// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 /* OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598 */
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EC_KEY *ec_key = NULL; EC_KEY *ec_key = NULL;
#endif #endif
@ -759,7 +759,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
EVP_PKEY_free(ephemeral_key); EVP_PKEY_free(ephemeral_key);
} }
#endif // SSL_get_server_tmp_key. #endif /* SSL_get_server_tmp_key. */
} }
GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server) GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server)
@ -866,7 +866,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
set_peer_cert_chain_info(tls, chan->ssl); set_peer_cert_chain_info(tls, chan->ssl);
set_server_temporary_key_info(tls, chan->ssl); set_server_temporary_key_info(tls, chan->ssl);
// Emit the TLS rec. /* Emit the TLS rec. */
signal_emit("tls handshake finished", 2, chan->server, tls); signal_emit("tls handshake finished", 2, chan->server, tls);
ret = 1; ret = 1;
@ -893,7 +893,7 @@ int irssi_ssl_handshake(GIOChannel *handle)
ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls); ret = irssi_ssl_verify(chan->ssl, chan->ctx, chan->server->connrec->address, chan->port, cert, chan->server, tls);
if (! ret) { if (! ret) {
// irssi_ssl_verify emits a warning itself. /* irssi_ssl_verify emits a warning itself. */
goto done; goto done;
} }
} }

2
src/fe-fuzz/irssi.c
View File

@ -21,7 +21,7 @@
#include "module.h" #include "module.h"
#include "modules-load.h" #include "modules-load.h"
#include "levels.h" #include "levels.h"
#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text #include "../fe-text/module-formats.h" /* need to explicitly grab from fe-text */
#include "themes.h" #include "themes.h"
#include "core.h" #include "core.h"
#include "fe-common-core.h" #include "fe-common-core.h"

4
src/fe-text/statusbar-items.c
View File

@ -369,8 +369,8 @@ static void item_lag(SBAR_ITEM_REC *item, int get_size_only)
last_lag_unknown = lag_unknown; last_lag_unknown = lag_unknown;
if (lag_unknown) { if (lag_unknown) {
// "??)" in C becomes ']' /* "??)" in C becomes ']'
// See: https://en.wikipedia.org/wiki/Digraphs_and_trigraphs#C See: https://en.wikipedia.org/wiki/Digraphs_and_trigraphs#C */
g_snprintf(str, sizeof(str), "%d (?""?)", lag / 100); g_snprintf(str, sizeof(str), "%d (?""?)", lag / 100);
} else { } else {
if (lag % 100 == 0) if (lag % 100 == 0)

6
src/irc/core/sasl.c
View File

@ -30,16 +30,16 @@
* Based on IRCv3 SASL Extension Specification: * Based on IRCv3 SASL Extension Specification:
* http://ircv3.net/specs/extensions/sasl-3.1.html * http://ircv3.net/specs/extensions/sasl-3.1.html
*/ */
#define AUTHENTICATE_CHUNK_SIZE 400 // bytes #define AUTHENTICATE_CHUNK_SIZE 400 /* bytes */
/* /*
* Maximum size to allow the buffer to grow to before the next fragment comes in. Note that * Maximum size to allow the buffer to grow to before the next fragment comes in. Note that
* due to the way fragmentation works, the maximum message size will actually be: * due to the way fragmentation works, the maximum message size will actually be:
* floor(AUTHENTICATE_MAX_SIZE / AUTHENTICATE_CHUNK_SIZE) + AUTHENTICATE_CHUNK_SIZE - 1 * floor(AUTHENTICATE_MAX_SIZE / AUTHENTICATE_CHUNK_SIZE) + AUTHENTICATE_CHUNK_SIZE - 1
*/ */
#define AUTHENTICATE_MAX_SIZE 8192 // bytes #define AUTHENTICATE_MAX_SIZE 8192 /* bytes */
#define SASL_TIMEOUT (20 * 1000) // ms #define SASL_TIMEOUT (20 * 1000) /* ms */
static gboolean sasl_timeout(IRC_SERVER_REC *server) static gboolean sasl_timeout(IRC_SERVER_REC *server)
{ {