diff options
| -rw-r--r-- | install.js | 29 | ||||
| -rw-r--r-- | src/core/Makefile.win32 | 3 | ||||
| -rw-r--r-- | src/encrypt.c | 11 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 12 insertions, 37 deletions
diff --git a/install.js b/install.js index 8e5b1557d..652916f2a 100644 --- a/install.js +++ b/install.js @@ -72,34 +72,7 @@ var installerQuestions = [ } } }, - - { - 'question' : [ - 'Do you want to compile Anope with Encrypted Passwords?', - 'NOTE: Once passwords are encrypted, they CANNOT be recovered!', - 'NOTE: Enabling Encrypted Passwords will also disable GETPASS/SENDPASS' - ], - 'short' : 'Enable Encrypted Passwords?', - 'options' : [ - 'yes', - 'no' - ], - 'default_answer' : 'no', - 'store_answer' : function (answer) { - installerResponses['Encrypted Passwords'] = answer; - return true; - }, - 'commit_config' : function() { - if (installerResponses['Encrypted Passwords'] == 'yes') { - f.WriteLine("DB_ENCRYPTION=1"); - f.WriteLine("BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)"); - } - else { - f.WriteLine("DB_ENCRYPTION=0"); - } - } - } - + ]; var buildPackages = [ diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32 index 82b471f67..43b1b67cf 100644 --- a/src/core/Makefile.win32 +++ b/src/core/Makefile.win32 @@ -1,7 +1,6 @@ include ../../Makefile.inc.win32 -SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_fantasy_unban.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c \ - os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c +SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_fantasy_unban.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c OBJECTS= $(SRCS:.c=.dll) CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include" LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:$(VERSION) diff --git a/src/encrypt.c b/src/encrypt.c index 904a7a97d..9a15f955d 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -18,9 +18,8 @@ Encryption encryption; /******************************************************************************/ -void -encmodule_encrypt(int (*func) - (const char *src, int len, char *dest, int size)) +void encmodule_encrypt(int (*func) + (const char *src, int len, char *dest, int size)) { encryption.encrypt = func; } @@ -40,9 +39,9 @@ void encmodule_decrypt(int (*func) (const char *src, char *dest, int size)) encryption.decrypt = func; } -void -encmodule_check_password(int (*func) - (const char *plaintext, const char *password)) +void encmodule_check_password(int (*func) + (const char *plaintext, + const char *password)) { encryption.check_password = func; } diff --git a/version.log b/version.log index 0a916fd12..2fbc5dae4 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="17" VERSION_EXTRA="-svn" -VERSION_BUILD="1185" +VERSION_BUILD="1186" # $Log$ # +# BUILD : 1.7.17 (1186) +# BUGS : N/A +# NOTES : Encryption fixes for win32 +# # BUILD : 1.7.17 (1185) # BUGS : N/A # NOTES : Encryption now offers the choice of none, old and md5 - the md5 module is nicely taken from irc-services and actaully works, yes, real md5, in anope, wow eh? |