m_capab.c fixed - please check whether I am correct

[irc/rqf/shadowircd.git] / modules / m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 5fab030520b8c5987f9f4076c74bab407886d115..bb4ff39abf06d25fc62a63db5e545efcf3782159 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_challenge.c 1483 2006-05-27 18:58:12Z jilles $
+ *  $Id: m_challenge.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
@@ -36,7 +36,6 @@
 #include <openssl/err.h>
 #endif
 
-#include "memory.h"
 #include "client.h"
 #include "ircd.h"
 #include "modules.h"
@@ -70,7 +69,7 @@ static int    challenge_load(void)
 #endif
 }
 
-DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 1483 $");
+DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
 #else
 
 static int m_challenge(struct Client *, struct Client *, int, const char **);
@@ -82,7 +81,7 @@ struct Message challenge_msgtab = {
 };
 
 mapi_clist_av1 challenge_clist[] = { &challenge_msgtab, NULL };
-DECLARE_MODULE_AV1(challenge, NULL, NULL, challenge_clist, NULL, NULL, "$Revision: 1483 $");
+DECLARE_MODULE_AV1(challenge, NULL, NULL, challenge_clist, NULL, NULL, "$Revision: 3161 $");
 
 static int generate_challenge(char **r_challenge, char **r_response, RSA * key);
 
@@ -92,8 +91,8 @@ cleanup_challenge(struct Client *target_p)
        if(target_p->localClient == NULL)
                return;
        
-       MyFree(target_p->localClient->challenge);
-       MyFree(target_p->localClient->opername);
+       rb_free(target_p->localClient->challenge);
+       rb_free(target_p->localClient->opername);
        target_p->localClient->challenge = NULL;
        target_p->localClient->opername = NULL;
        target_p->localClient->chal_time = 0;
@@ -161,12 +160,12 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                                                     source_p->name, source_p->username,
                                                     source_p->host);
 
-                       MyFree(b_response);
+                       rb_free(b_response);
                        cleanup_challenge(source_p);
                        return 0;
                }
 
-               MyFree(b_response);
+               rb_free(b_response);
 
                oper_p = find_oper_conf(source_p->username, source_p->orighost, 
                                        source_p->sockhost, 
@@ -220,8 +219,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 
        if(!oper_p->rsa_pubkey)
        {
-               sendto_one(source_p, ":%s NOTICE %s :I'm sorry, PK authentication "
-                          "is not enabled for your oper{} block.", me.name, parv[0]);
+               sendto_one_notice(source_p, ":I'm sorry, PK authentication is not enabled for your oper{} block.");
                return 0;
        }
 
@@ -241,8 +239,8 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                }
                sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2), 
                           me.name, source_p->name);
-               MyFree(challenge);
-               DupString(source_p->localClient->opername, oper_p->name);
+               rb_free(challenge);
+               source_p->localClient->opername = rb_strdup(oper_p->name);
        }
        else
                sendto_one_notice(source_p, ":Failed to generate challenge.");
@@ -288,21 +286,21 @@ generate_challenge(char **r_challenge, char **r_response, RSA * rsa)
        {
                SHA1_Init(&ctx);
                SHA1_Update(&ctx, (u_int8_t *)secret, CHALLENGE_SECRET_LENGTH);
-               *r_response = MyMalloc(SHA_DIGEST_LENGTH);
+               *r_response = rb_malloc(SHA_DIGEST_LENGTH);
                SHA1_Final((u_int8_t *)*r_response, &ctx);
 
                length = RSA_size(rsa);
-               tmp = MyMalloc(length);
+               tmp = rb_malloc(length);
                ret = RSA_public_encrypt(CHALLENGE_SECRET_LENGTH, secret, tmp, rsa, RSA_PKCS1_OAEP_PADDING);
 
                if (ret >= 0)
                {
                        *r_challenge = (char *)ircd_base64_encode(tmp, ret);
-                       MyFree(tmp);
+                       rb_free(tmp);
                        return 0;
                }
-               MyFree(tmp);
-               MyFree(*r_response);
+               rb_free(tmp);
+               rb_free(*r_response);
                *r_response = NULL;
        }