Update some modules so they work with this newfangled system.
This commit is contained in:
William Pitcock
parent
445ae0d752
commit
988ff81b8b
|
|
@ -1,159 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2005 Atheme Development Group
|
||||
* Rights to this code are as documented in doc/LICENSE.
|
||||
*
|
||||
* IRCServices's weird password encryption thingy, taken from Anope 1.6.3.
|
||||
*
|
||||
*/
|
||||
/* Include file for high-level encryption routines.
|
||||
*
|
||||
* (C) 2003 Anope Team
|
||||
* Contact us at info@anope.org
|
||||
*
|
||||
* Please read COPYING and README for furhter details.
|
||||
*
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $\Id: myencrypt.c 5 2004-03-29 01:29:50Z dane $
|
||||
*
|
||||
*/
|
||||
|
||||
#include "atheme.h"
|
||||
|
||||
// Record password transition log?
|
||||
// #define PW_TRANSITION_LOG "./pwtransition.sh"
|
||||
|
||||
/* necessary anope defines */
|
||||
#define PASSMAX 32
|
||||
#define ENCRYPT_MD5
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/******** Our own high-level routines. ********/
|
||||
|
||||
|
||||
#define XTOI(c) ((c)>9 ? (c)-'A'+10 : (c)-'0')
|
||||
/* Result of this:
|
||||
* c in [-128,9] => [-183,-46]
|
||||
* c in [10,127] => [-38,79]
|
||||
*/
|
||||
|
||||
/* Encrypt `src' of length `len' and store the result in `dest'. If the
|
||||
* resulting string would be longer than `size', return -1 and leave `dest'
|
||||
* unchanged; else return 0.
|
||||
*/
|
||||
static int myencrypt(const char *src, int len, char *dest, int size)
|
||||
{
|
||||
|
||||
#ifdef ENCRYPT_MD5
|
||||
|
||||
MD5_CTX context;
|
||||
char digest[33];
|
||||
char dest2[16];
|
||||
int i;
|
||||
#ifdef PW_TRANSITION_LOG
|
||||
FILE *tp;
|
||||
#endif
|
||||
if (size < 32)
|
||||
return -1;
|
||||
|
||||
memset(&context, 0, sizeof(context));
|
||||
memset(&digest, 0, sizeof(digest));
|
||||
|
||||
MD5Init(&context);
|
||||
MD5Update(&context, (unsigned const char *) src, (size_t) len);
|
||||
MD5Final((unsigned char *) digest, &context);
|
||||
|
||||
/* convert to hex, skipping last 8 bytes (constant) -- jilles */
|
||||
// strcpy(digest, "$ircservices$");
|
||||
for (i = 0; i <= 7; i++)
|
||||
// sprintf(dest + 13 + 2 * i, "%02x", 255 & digest[i]);
|
||||
sprintf(dest + 2 * i, "%02x", 255 & digest[i]);
|
||||
#ifdef PW_TRANSITION_LOG
|
||||
tp = popen(PW_TRANSITION_LOG,"w");
|
||||
if (tp != NULL)
|
||||
{
|
||||
fprintf(tp,"%s\n%s\n",src,dest);
|
||||
pclose(tp);
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
|
||||
#endif
|
||||
|
||||
return -1; /* unknown encryption algorithm */
|
||||
}
|
||||
|
||||
#if 0 /* unused */
|
||||
/* Shortcut for encrypting a null-terminated string in place. */
|
||||
static int encrypt_in_place(char *buf, int size)
|
||||
{
|
||||
return myencrypt(buf, strlen(buf), buf, size);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Compare a plaintext string against an encrypted password. Return 1 if
|
||||
* they match, 0 if not, and -1 if something went wrong. */
|
||||
|
||||
static int check_password(const char *plaintext, const char *password)
|
||||
{
|
||||
char buf[BUFSIZE];
|
||||
|
||||
if (myencrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
|
||||
return -1;
|
||||
#ifdef ENCRYPT_MD5
|
||||
if (strcmp(buf, password) == 0)
|
||||
#else
|
||||
if (0)
|
||||
#endif
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
DECLARE_MODULE_V1
|
||||
(
|
||||
"crypto/ircservices", false, _modinit, _moddeinit,
|
||||
PACKAGE_STRING,
|
||||
"Jilles Tjoelker <jilles@stack.nl>"
|
||||
);
|
||||
|
||||
static char *ircservices_crypt_string(char *key, char *salt)
|
||||
{
|
||||
static char output[PASSMAX];
|
||||
if (salt[0] == '$' && salt[1] == '1') /* this is a new pw XXX */
|
||||
{
|
||||
myencrypt(key, strlen(key), output, PASSMAX);
|
||||
return output;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (check_password(key, salt))
|
||||
return salt;
|
||||
else
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
void _modinit(module_t *m)
|
||||
{
|
||||
crypt_string = &ircservices_crypt_string;
|
||||
|
||||
crypto_module_loaded = true;
|
||||
}
|
||||
|
||||
void _moddeinit(module_unload_intent_t intent)
|
||||
{
|
||||
crypt_string = &generic_crypt_string;
|
||||
|
||||
crypto_module_loaded = false;
|
||||
}
|
||||
|
||||
/* vim:cinoptions=>s,e0,n0,f0,{0,}0,^0,=s,ps,t0,c3,+s,(2s,us,)20,*30,gs,hs
|
||||
* vim:ts=8
|
||||
* vim:sw=8
|
||||
* vim:noexpandtab
|
||||
*/
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
*/
|
||||
|
||||
#include "atheme.h"
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
#include <sys/event.h>
|
||||
|
||||
DECLARE_MODULE_V1
|
||||
|
|
@ -93,6 +95,7 @@ static void os_cmd_procwatch(sourceinfo_t *si, int parc, char *parv[])
|
|||
}
|
||||
command_success_nodata(si, "Added pid %ld to list.", v);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* vim:cinoptions=>s,e0,n0,f0,{0,}0,^0,=s,ps,t0,c3,+s,(2s,us,)20,*30,gs,hs
|
||||
* vim:ts=8
|
||||
|
|
|
|||
Loading…
Reference in New Issue