Say "SSL certificate fingerprint" instead of "SSL fingerprint" everywhere

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index bd959f0d2c7720245fb6ba69266b59c64c696bcb..bd907cf69def942518285db1ac9181f415aff810 100644 (file)
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -1027,8 +1027,8 @@ Matching extbans:
                module).
  s:server      Matches users on a matching server (requires serverban
                module).
- z:fingerprint Matches users with a matching ssl fingerprint (requires
-               sslmodes module)
+ z:fingerprint Matches users with a matching SSL certificate fingerprint
+               (requires sslmodes module)
  O:opertype    Matches IRCops of a matching type, mostly useful as an
                an invite exception (requires operchans module).
  R:account     Matches users logged into a matching account (requires

diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf.example
index dbb29f1ff298cfe67c3c984fe4f110eb6adfea1c..7f27affb92a8b1690bdcca98f76c322806eab0ef 100644 (file)
--- a/docs/conf/links.conf.example
+++ b/docs/conf/links.conf.example
@@ -46,9 +46,9 @@
       ssl="gnutls"
 
       # fingerprint: If defined, this option will force servers to be
-      # authenticated using SSL Fingerprints. See http://wiki.inspircd.org/SSL
-      # for more information. This will require an SSL link for both inbound
-      # and outbound connections.
+      # authenticated using SSL certificate fingerprints. See
+      # http://wiki.inspircd.org/SSL for more information. This will
+      # require an SSL link for both inbound and outbound connections.
       #fingerprint=""
 
       # bind: Local IP address to bind to.

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index b96405d4ce152f61168d162929e17fbd7bfb05db..d36c0beaa4c6625313d0295a8f8f3243f9da04aa 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1754,7 +1754,7 @@
 # scripts to validate users. For this to work, one of m_ssl_gnutls.so
 # or m_ssl_openssl.so must be loaded. This module also adds the
 # "* <user> is using a secure connection" whois line, the ability for
-# opers to use SSL fingerprints to verify their identity and the
+# opers to use SSL cert fingerprints to verify their identity and the
 # ability to force opers to use SSL connections in order to oper up.
 # It is highly recommended to load this module if you use SSL on your
 # network.

diff --git a/docs/conf/modules/charybdis.conf.example b/docs/conf/modules/charybdis.conf.example
index bd99f7dc2396bbe91408a8276894f6e670cf1e6b..35f55e074e81d75475138d2c6691248809f2f02f 100644 (file)
--- a/docs/conf/modules/charybdis.conf.example
+++ b/docs/conf/modules/charybdis.conf.example
@@ -270,8 +270,8 @@
 # scripts to validate users. For this to work, one of m_ssl_gnutls.so
 # or m_ssl_openssl.so must be loaded. This module also adds the 
 # "* <user> is using a secure connection" whois line, the ability for
-# opers to use SSL fingerprints to verify their identity and the ability
-# to force opers to use SSL connections in order to oper up.
+# opers to use SSL cert fingerprints to verify their identity and the
+# ability to force opers to use SSL connections in order to oper up.
 # It is highly recommended to load this module especially if
 # you use SSL on your network.
 # For how to use the oper features, please see the first example <oper> tag

diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf.example
index eef8039cb2061ac37cccad638d02349004e4d3fe..996fded6d7b6d0d38bea67ed73c0891a3c70f3b1 100644 (file)
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf.example
@@ -106,10 +106,10 @@
       # If m_sslinfo isn't loaded, this option will be ignored.
       #fingerprint="67cb9dc013248a829bb2171ed11becd4"
 
-      # autologin: If an SSL fingerprint for this oper is specified, you can
-      # have the oper block automatically log in. This moves all security of the
-      # oper block to the protection of the client certificate, so be sure that
-      # the private key is well-protected! Requires m_sslinfo.
+      # autologin: If an SSL certificate fingerprint for this oper is specified,
+      # you can have the oper block automatically log in. This moves all security
+      # of the oper block to the protection of the client certificate, so be sure
+      # that the private key is well-protected! Requires m_sslinfo.
       #autologin="on"
 
       # sslonly: If on, this oper can only oper up if they're using a SSL connection.

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 462209e010465256a07d90409d695bdba88d41b0..718bdd1ea99ab624a527cc981e151b2dca3196ee 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -931,7 +931,7 @@ info_done_dealloc:
                        text.append(UnknownIfNULL(gnutls_mac_get_name(gnutls_mac_get(sess)))).append("'");
 
                        if (!certificate->fingerprint.empty())
-                               text += " and your SSL fingerprint is " + certificate->fingerprint;
+                               text += " and your SSL certificate fingerprint is " + certificate->fingerprint;
 
                        user->WriteNotice(text);
                }

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index d8ea16bdf0dcc281a2d2ae5cb86fbd52df855b22..9101ecd551258e4163918301c293ad03c0e0cebc 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -539,7 +539,7 @@ class OpenSSLIOHook : public SSLIOHook
                        std::string text = "*** You are connected using SSL cipher '" + std::string(SSL_get_cipher(sess)) + "'";
                        const std::string& fingerprint = certificate->fingerprint;
                        if (!fingerprint.empty())
-                               text += " and your SSL fingerprint is " + fingerprint;
+                               text += " and your SSL certificate fingerprint is " + fingerprint;
 
                        user->WriteNotice(text);
                }

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 520719c5afa9fd34981499d2d103330e342cb843..2001d560de06e578f00fb51cabde35484fe6f932 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -75,9 +75,9 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
                /* Require fingerprint to exist and match */
                if (link.Fingerprint != fp)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL fingerprint on link %s: need \"%s\" got \"%s\"",
+                       ServerInstance->SNO->WriteToSnoMask('l',"Invalid SSL certificate fingerprint on link %s: need \"%s\" got \"%s\"",
                                link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str());
-                       SendError("Provided invalid SSL fingerprint " + fp + " - expected " + link.Fingerprint);
+                       SendError("Invalid SSL certificate fingerprint " + fp + " - expected " + link.Fingerprint);
                        return false;
                }
        }
@@ -101,7 +101,7 @@ bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
        // this time
        if ((!capab->auth_fingerprint) && (!fp.empty()))
        {
-               ServerInstance->SNO->WriteToSnoMask('l', "SSL fingerprint for link %s is \"%s\". "
+               ServerInstance->SNO->WriteToSnoMask('l', "SSL certificate fingerprint for link %s is \"%s\". "
                        "You can improve security by specifying this in <link:fingerprint>.", link.Name.c_str(), fp.c_str());
        }
 

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 295646148b689b900152e7c29eb5e7e5ed9bae39..e42ab5e67fb2fa4fe2bb10b5b41b7f705c4be25c 100644 (file)
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -104,7 +104,7 @@ void TreeSocket::DoBurst(TreeServer* s)
 {
        ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
                s->GetName().c_str(),
-               capab->auth_fingerprint ? "SSL Fingerprint and " : "",
+               capab->auth_fingerprint ? "SSL certificate fingerprint and " : "",
                capab->auth_challenge ? "challenge-response" : "plaintext password");
        this->CleanNegotiationInfo();
        this->WriteLine(CmdBuilder("BURST").push_int(ServerInstance->Time()));

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index b775905c02438e4ae1d2049ce3b002e2a83ee6dc..27c8ab2753166e9053939dc2edf04e69e040ab58 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -73,7 +73,7 @@ struct CapabData
        std::string ourchallenge;               /* Challenge sent for challenge/response */
        std::string theirchallenge;             /* Challenge recv for challenge/response */
        int capab_phase;                        /* Have sent CAPAB already */
-       bool auth_fingerprint;                  /* Did we auth using SSL fingerprint */
+       bool auth_fingerprint;                  /* Did we auth using SSL certificate fingerprint */
        bool auth_challenge;                    /* Did we auth using challenge/response */
 
        // Data saved from incoming SERVER command, for later use when our credentials have been accepted by the other party

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index cac09a412f7d816f9e46a225af413fa82a7ae761..c354e4e0ecfcc4794f6b972574cabafc0e615d01 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -184,7 +184,7 @@ class ModuleSSLInfo : public Module
                                std::string fingerprint;
                                if (ifo->oper_block->readString("fingerprint", fingerprint) && (!cert || cert->GetFingerprint() != fingerprint))
                                {
-                                       user->WriteNumeric(491, ":This oper login requires a matching SSL fingerprint.");
+                                       user->WriteNumeric(491, ":This oper login requires a matching SSL certificate fingerprint.");
                                        user->CommandFloodPenalty += 10000;
                                        return MOD_RES_DENY;
                                }