From: Matthew Beeching Date: Fri, 28 May 2021 22:34:09 +0000 (+0100) Subject: Changed "sslfp" to "certfp" and "SSL fingerprint" to "client certificate fingerprint... X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/b469e840b09b16aa70e46f6827e09d4b1436dc0f?hp=2ef76f048b192a0993af0ec5071383951b1de5e3 Changed "sslfp" to "certfp" and "SSL fingerprint" to "client certificate fingerprint" (note: this change will require addsslfp, delsslfp, oaddsslfp and odelsslfp be rebound) --- diff --git a/src/nickserv.c b/src/nickserv.c index 84f9b89..a768fa0 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -264,7 +264,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_HANDLEINFO_LAST_HOST_UNKNOWN", "Last quit hostmask: Unknown" }, { "NSMSG_HANDLEINFO_NICKS", "Nickname(s): %s" }, { "NSMSG_HANDLEINFO_MASKS", "Hostmask(s): %s" }, - { "NSMSG_HANDLEINFO_SSLFPS", "SSL Fingerprints(s): %s" }, + { "NSMSG_HANDLEINFO_SSLFPS", "Client Certificate Fingerprints(s): %s" }, { "NSMSG_HANDLEINFO_IGNORES", "Ignore(s): %s" }, { "NSMSG_HANDLEINFO_CHANNELS", "Channel(s): %s" }, { "NSMSG_HANDLEINFO_CURRENT", "Current nickname(s): %s" }, @@ -299,13 +299,13 @@ static const struct message_entry msgtab[] = { { "NSMSG_ADDMASK_SUCCESS", "Hostmask %s added." }, { "NSMSG_ADDIGNORE_ALREADY", "$b%s$b is already an ignored hostmask in your account." }, { "NSMSG_ADDIGNORE_SUCCESS", "Hostmask %s added." }, - { "NSMSG_ADDSSLFP_ALREADY", "$b%s$b is already an SSL fingerprint in your account." }, - { "NSMSG_ADDSSLFP_SUCCESS", "SSL fingerprint %s added." }, + { "NSMSG_ADDSSLFP_ALREADY", "$b%s$b is already a client certificate fingerprint in your account." }, + { "NSMSG_ADDSSLFP_SUCCESS", "Client certificate fingerprint %s added." }, { "NSMSG_DELMASK_NOTLAST", "You may not delete your last hostmask." }, { "NSMSG_DELMASK_SUCCESS", "Hostmask %s deleted." }, { "NSMSG_DELMASK_NOT_FOUND", "Unable to find mask to be deleted." }, - { "NSMSG_DELSSLFP_SUCCESS", "SSL fingerprint %s deleted." }, - { "NSMSG_DELSSLFP_NOT_FOUND", "Unable to find SSL fingerprint to be deleted." }, + { "NSMSG_DELSSLFP_SUCCESS", "Client certificate fingerprint %s deleted." }, + { "NSMSG_DELSSLFP_NOT_FOUND", "Unable to find client certificate fingerprint to be deleted." }, { "NSMSG_OPSERV_LEVEL_BAD", "You may not promote another oper above your level." }, { "NSMSG_USE_CMD_PASS", "Please use the PASS command to change your password." }, { "NSMSG_UNKNOWN_NICK", "I know nothing about nick $b%s$b." }, @@ -6030,10 +6030,10 @@ init_nickserv(const char *nick) nickserv_define_func("OADDMASK", cmd_oaddmask, 0, 1, 0); nickserv_define_func("DELMASK", cmd_delmask, -1, 1, 0); nickserv_define_func("ODELMASK", cmd_odelmask, 0, 1, 0); - nickserv_define_func("ADDSSLFP", cmd_addsslfp, -1, 1, 0); - nickserv_define_func("OADDSSLFP", cmd_oaddsslfp, 0, 1, 0); - nickserv_define_func("DELSSLFP", cmd_delsslfp, -1, 1, 0); - nickserv_define_func("ODELSSLFP", cmd_odelsslfp, 0, 1, 0); + nickserv_define_func("ADDCERTFP", cmd_addsslfp, -1, 1, 0); + nickserv_define_func("OADDCERTFP", cmd_oaddsslfp, 0, 1, 0); + nickserv_define_func("DELCERTFP", cmd_delsslfp, -1, 1, 0); + nickserv_define_func("ODELCERTFP", cmd_odelsslfp, 0, 1, 0); nickserv_define_func("PASS", cmd_pass, -1, 1, 0); nickserv_define_func("SET", cmd_set, -1, 1, 0); nickserv_define_func("OSET", cmd_oset, 0, 1, 0); diff --git a/src/nickserv.help b/src/nickserv.help index eaae15d..aa28596 100644 --- a/src/nickserv.help +++ b/src/nickserv.help @@ -102,8 +102,8 @@ " $bPASS$b Change your account's password.", " $bADDMASK$b Add a hostmask to your account.", " $bDELMASK$b Remove a hostmask from your account.", - " $bADDSSLFP$b Add an SSL fingerprint to your account.", - " $bDELSSLFP$b Remove an SSL fingerprint from your account.", + " $bADDCERTFP$b Add a client certificate fingerprint to your account.", + " $bDELCERTFP$b Remove a client certificate fingerprint from your account.", " $bSET$b Set per-account options.", " $bGHOST$b Disconnects your old clients", " $bACCOUNT FLAGS$b Definition for each account flag" @@ -119,8 +119,8 @@ " $bPASS$b Change your account's password.", " $bADDMASK$b Add a hostmask to your account.", " $bDELMASK$b Remove a hostmask from your account.", - " $bADDSSLFP$b Add an SSL fingerprint to your account.", - " $bDELSSLFP$b Remove an SSL fingerprint from your account.", + " $bADDCERTFP$b Add a client certificate fingerprint to your account.", + " $bDELCERTFP$b Remove a client certificate fingerprint from your account.", " $bSET$b Set per-account options.", " $bRENAME$b Renames an account", " $bACCOUNT FLAGS$b Definition for each account flag" @@ -154,8 +154,8 @@ "*$bOUNREGNICK$b Remove a nick from someone's account.", " $bOADDMASK$b Add a mask to someone's account.", " $bODELMASK$b Remove a mask from someone's account.", - " $bOADDSSLFP$b Add an SSL fingerprint to someone's account.", - " $bODELSSLFP$b Remove an SSL fingerprint from someone's account.", + " $bOADDCERTFP$b Add a client certificate fingerprint to someone's account.", + " $bODELCERTFP$b Remove a client certificate fingerprint from someone's account.", " $bOADDIGNORE$b Add an ignore to someone's account.", " $bODELIGNORE$b Remove an ignore from someone's account.", " $bMERGEDB$b Load a database into memory.", @@ -720,28 +720,28 @@ "$uSee Also:$u oaddignore" ); -"ADDSSLFP" ( - "/msg $N ADDSSLFP [fingerprint]", - "Adds the specified SSL fingerprint to the account you are authenticated to with $b$N$b. If no SSL fingerprint is given, it uses your current SSL fingerprint if available.", - "$uSee Also:$u auth, delsslfp" +"ADDCERTFP" ( + "/msg $N ADDCERTFP [fingerprint]", + "Adds the specified client certificate fingerprint to the account you are authenticated to with $b$N$b. If no client certificate fingerprint is given, it uses your current client certificate fingerprint if available.", + "$uSee Also:$u auth, delcertfp" ); -"DELSSLFP" ( - "/msg $N DELSSLFP [fingerprint]", - "Removes the specified SSL fingerprint to the account you are authenticated to with $b$N$b. If no SSL fingerprint is given, it uses your current SSL fingerprint if available.", - "$uSee Also:$u addsslfp" +"DELCERTFP" ( + "/msg $N DELCERTFP [fingerprint]", + "Removes the specified client certificate fingerprint to the account you are authenticated to with $b$N$b. If no client certificate fingerprint is given, it uses your current client certificate fingerprint if available.", + "$uSee Also:$u addcertfp" ); -"OADDSSLFP" ( - "/msg $N OADDSSLFP ", - "Adds an SSL fingerprint to the specified account. You may use *Account instead of Nick as the name argument; the * makes $b$N$b use the name of an account directly (useful if the user is not online).", - "$uSee Also:$u odelsslfp" +"OADDCERTFP" ( + "/msg $N OADDCERTFP ", + "Adds an client certificate fingerprint to the specified account. You may use *Account instead of Nick as the name argument; the * makes $b$N$b use the name of an account directly (useful if the user is not online).", + "$uSee Also:$u odelcertfp" ); -"ODELSSLFP" ( - "/msg $N ODELSSLFP ", - "Removes an SSL fingerprint from the specified account. You may use *Account instead of Nick as the name argument; the * makes $b$N$b use the name of an account directly (useful if the user is not online).", - "$uSee Also:$u oaddsslfp" +"ODELCERTFP" ( + "/msg $N ODELCERTFP ", + "Removes an client certificate fingerprint from the specified account. You may use *Account instead of Nick as the name argument; the * makes $b$N$b use the name of an account directly (useful if the user is not online).", + "$uSee Also:$u oaddcertfp" ); "CHECKPASS" ( diff --git a/src/opserv.c b/src/opserv.c index 4480881..0f24c5a 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -217,8 +217,8 @@ static const struct message_entry msgtab[] = { { "OSMSG_WHOIS_PRIVS", "IRCd Privs : %s" }, { "OSMSG_WHOIS_CHANNELS", "Channels : %s" }, { "OSMSG_WHOIS_HIDECHANS", "Channel list omitted for your sanity." }, - { "OSMSG_WHOIS_VERSION", "Version : %s" }, - { "OSMSG_WHOIS_SSLFP", "SSL f/print : %s" }, + { "OSMSG_WHOIS_VERSION", "Version : %s" }, + { "OSMSG_WHOIS_SSLFP", "Cert f/print : %s" }, { "OSMSG_WHOIS_MARK", "Mark : %s" }, { "OSMSG_WHOIS_MARKS", "Marks : %s" }, { "OSMSG_WHOIS_NO_NOTICE", "No_notices : %s" }, diff --git a/src/proto-p10.c b/src/proto-p10.c index 0d9278a..731b1cf 100644 --- a/src/proto-p10.c +++ b/src/proto-p10.c @@ -2010,7 +2010,7 @@ static CMD_FUNC(cmd_burst) return res; } -/* TODO: +/* TODO: * This is a stub that doesn't actually do anything. It should be completed * so that bans on *!*@markname.* match users as it does in nefarious */ @@ -2019,7 +2019,7 @@ static CMD_FUNC(cmd_mark) const char *tstr; int type = 4; struct userNode *target; - /* + /* * log_module(MAIN_LOG, LOG_ERROR, "DEBUG: mark, user %s, type %s, arg %s", argv[1], argv[2], argv[3]); */ @@ -2058,7 +2058,7 @@ static CMD_FUNC(cmd_mark) } else target->mark = strdup(argv[3]); return 1; - + } else if(!strcasecmp(argv[2], "CVERSION")) { /* CTCP VERSION mark */