m_challenge: fix use of undefined behaviour.

[solanum.git] / modules / m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 92f19d3ce0d681c8a31d694de805c558216629fe..68070df7d3856b0d7509b1600d5d85fb4ba0741f 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -143,7 +143,8 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                        return 0;                       
                }
 
-               b_response = rb_base64_decode((const unsigned char *)++parv[1], strlen(parv[1]), &len);
+               parv[1]++;
+               b_response = rb_base64_decode((const unsigned char *)parv[1], strlen(parv[1]), &len);
 
                if(len != SHA_DIGEST_LENGTH ||
                   memcmp(source_p->localClient->challenge, b_response, SHA_DIGEST_LENGTH))
@@ -237,6 +238,25 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                return 0;
        }
 
+       if (oper_p->certfp != NULL)
+       {
+               if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+               {
+                       sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
+                       ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
+                            parv[1], source_p->name,
+                            source_p->username, source_p->host, source_p->sockhost);
+
+                       if(ConfigFileEntry.failed_oper_notice)
+                       {
+                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                                    "Failed OPER attempt - client certificate fingerprint mismatch by %s (%s@%s)",
+                                                    source_p->name, source_p->username, source_p->host);
+                       }
+                       return 0;
+               }
+       }
+
        if(!generate_challenge(&challenge, &(source_p->localClient->challenge), oper_p->rsa_pubkey))
        {
                char *chal = challenge;