Make some more files compile.

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

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index d71abcc843ce7dadc32b30385f4196d3e13d64df..9c2701153322d873c7e0cf466ab92cba4826531d 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -91,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;
@@ -128,7 +128,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                if(!source_p->localClient->challenge)
                        return 0;
 
-               if((CurrentTime - source_p->localClient->chal_time) > CHALLENGE_EXPIRES)
+               if((rb_current_time() - source_p->localClient->chal_time) > CHALLENGE_EXPIRES)
                {
                        sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name);
                        ilog(L_FOPER, "EXPIRED CHALLENGE (%s) by (%s!%s@%s) (%s)",
@@ -160,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, 
@@ -226,7 +226,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
        if(!generate_challenge(&challenge, &(source_p->localClient->challenge), oper_p->rsa_pubkey))
        {
                char *chal = challenge;
-               source_p->localClient->chal_time = CurrentTime;
+               source_p->localClient->chal_time = rb_current_time();
                for(;;)
                {
                        cnt = strlcpy(chal_line, chal, CHALLENGE_WIDTH);
@@ -239,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.");
@@ -286,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;
        }