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 ef708d2c0beb200fb5409c03131690056a0d89c1..bb4ff39abf06d25fc62a63db5e545efcf3782159 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -36,7 +36,6 @@
 #include <openssl/err.h>
 #endif
 
-#include "memory.h"
 #include "client.h"
 #include "ircd.h"
 #include "modules.h"
@@ -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, 
@@ -240,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.");
@@ -287,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;
        }