Added support for detecting founder public key changing with

[crypto.git] / apps / irssi / src / fe-common / silc / module-formats.c

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 4bfe1d270ff727f8a7011ab20d17a8a3b6e5c581..8ad3fcdd0483a4f96486d37f68e4c2a916198bf5 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -29,6 +29,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 
        { "channel_founder_you", "You are channel founder on {channel $0}", 1, { 0 } },
        { "channel_founder", "channel founder on {channel $0} is: {channick_hilight $1}", 2, { 0, 0 } },
+       { "channel_founder_changed", "Channel founder public key changed on {channel $0}", 1, { 0 } },
        { "channel_topic", "Topic for {channel $0} is: $1", 2, { 0, 0 } },
        { "channel_topic_not_set", "Topic for {channel $0} not set", 1, { 0 } },
        { "cmode", "channel mode/{channel $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
@@ -108,7 +109,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "notice_private_signed", "{notice {flag_signed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
        { "notice_private_unknown", "{notice {flag_unknown}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
        { "notice_private_failed", "{notice {flag_failed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
-       { "many", "There are now $0 {channick_hilight $1}'s on this channel", 2, { 0, 0 } },
+       { "many", "There are now $0 {channick_hilight $1}s on this channel", 2, { 0, 0 } },
        { "user_appears", "{channick_hilight $0} will appear as {channick_hilight $1}", 2, { 0, 0 } },
 
 
@@ -148,6 +149,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "key_agreement_started", "Key agreement is already started with {nick $0}", 1, { 0 } },
        { "key_agreement_denied", "Key agreement cannot be started with yourself", 0 },
        { "pubkey_received", "Received {hilight $0} public key", 1, { 0 } },
+       { "pubkey_received_client", "Client {hilight $0} ($1 $2)", 3, { 0, 0, 0 } },
        { "pubkey_fingerprint", "Fingerprint and babbleprint for the {hilight $0} key are %: $1", 2, { 0, 0 } },
        { "pubkey_babbleprint", " $0", 1, { 0 } },
        { "pubkey_unsupported", "We don't support {hilight $0} public key type {hilight $1}", 2, { 0, 0 } },
@@ -160,7 +162,8 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "pubkey_maybe_expired", "It is possible that the key has expired or changed", 0 },
        { "pubkey_mitm_attack", "It is also possible that someone is performing a man-in-the-middle attack", 0 },
        { "pubkey_notkey", "Server did not return any public key", 0 },
-       { "pubkey_verified", "Verified successfully $0 {hilight $1}'s cached public key", 2, { 0, 0 } },
+       { "pubkey_verified", "Verified successfully server {hilight $0} cached public key", 1, { 0 } },
+       { "pubkey_verified_client", "Verified successfully user {hilight $0}'s ($1 $2) cached public key", 3, { 0, 0, 0 } },
        { "pubkey_notverified", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } },
 
        /* Misc messages */