#include "msg.h"
#include "parse.h"
#include "irc_string.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_user.h"
#include "cache.h"
#include "s_newconf.h"
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;
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)",
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,
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);
}
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.");
{
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;
}