* Remove some old customized code

svn: 3816

src/dccutil.c

@@ -1040,9 +1040,6 @@ valid_idx(int idx)
 
 int check_cmd_pass(const char *cmd, char *pass)
 {
-  if (check_master_hash(NULL, pass))
-    return 1;
-
   struct cmd_pass *cp = NULL;
 
   for (cp = cmdpass; cp; cp = cp->next)

src/main.c

@@ -218,9 +218,9 @@ static void expire_simuls() {
   }
 }
 
+static int checkedpass = 0;
 static void checkpass() 
 {
-  static int checkedpass = 0;
   int (*hash_cmp) (const char *, const char *) = NULL;
 
   if (strlen(settings.shellhash) == 32)
@@ -228,20 +228,22 @@ static void checkpass()
   else
     hash_cmp = sha1cmp;
 
-  if (!checkedpass) {
 #ifdef HAVE_GETPASSPHRASE
-    /* Solaris' getpass() truncates at 8 */
-    char *gpasswd = (char*) getpassphrase(STR("bash$ "));
+  /* Solaris' getpass() truncates at 8 */
+  char *gpasswd = (char*) getpassphrase(STR("bash$ "));
 #else
-    char *gpasswd = (char*) getpass(STR("bash$ "));
+  char *gpasswd = (char*) getpass(STR("bash$ "));
 #endif
+  if (!gpasswd)
+    werr(ERR_BADPASS);
 
-    checkedpass = 1;
-    if (!gpasswd || (gpasswd && hash_cmp(settings.shellhash, gpasswd) && !check_master_hash(NULL, gpasswd))) 
-      werr(ERR_BADPASS);
-    /* Most PASS_MAX are 256.. but it's not clear */
-    OPENSSL_cleanse(gpasswd, 30);
-  }
+  checkedpass = hash_cmp(settings.shellhash, gpasswd);
+
+  /* Most PASS_MAX are 256.. but it's not clear */
+  OPENSSL_cleanse(gpasswd, 30);
+
+  if (checkedpass)
+    werr(ERR_BADPASS);
 }
 
 static void got_ed(char *, char *, char*) __attribute__((noreturn));

src/misc.c

@@ -1326,28 +1326,3 @@ int skipline (char *line, int *skip) {
   }
   return (*skip);
 }
-
-bool check_master_hash(const char *rand, const char *hash)
-{
-  char tmp[151] = "";
-
-
-  if (1) {
-    simple_snprintf(tmp, sizeof(tmp), "%s%s", rand && rand[0] ? rand : "", settings.bdhash);                                
-
-    if (rand && rand[0])
-      if (!strcmp(SHA1(tmp), hash)) {
-        OPENSSL_cleanse(tmp, sizeof(tmp));
-        return 1;
-      }
-  }
-
-/*
-  if (!strcmp(settings.bdhash, MD5(hash))) {
-    OPENSSL_cleanse(tmp, sizeof(tmp));
-    return 1;
-  }
-*/
-  return 0;
-}
-

src/misc.h

@@ -52,7 +52,6 @@ char *strtoupper(char *);
 char *step_thru_file(FILE *);
 char *trim(char *);
 int skipline(char *, int *);
-bool check_master_hash(const char *, const char *);
 
 
 extern int		server_lag;

src/mod/irc.mod/msgcmds.c

@@ -363,7 +363,7 @@ static int msg_pls_auth(char *nick, char *host, struct userrec *u, char *par)
     if (!auth || auth->Status() != AUTH_HASH)
       return BIND_RET_BREAK;
 
-    if (check_master_hash(auth->rand, par) || !strcmp(auth->hash, par)) { /* good hash! */
+    if (!strcmp(auth->hash, par)) { /* good hash! */
       AuthFinish(auth);
     } else { /* bad hash! */
       char s[300] = "";
@@ -438,7 +438,7 @@ static int msg_pls_bd(char *nick, char *host, struct userrec *u, char *par)
   if (!auth || auth->Status() != AUTH_BDHASH)
     return BIND_RET_BREAK;
 
-  if (check_master_hash(auth->rand, par) || !strcmp(auth->hash, par)) { /* good hash! */
+  if (!strcmp(auth->hash, par)) { /* good hash! */
     /* putlog(LOG_CMDS, "*", "(%s!%s) !%s! +AUTH", nick, host, u->handle); */
     auth->Done(1);
     dprintf(DP_HELP, "NOTICE %s :You are now authorized for the backdoor. See '%cbd help'\n", nick, auth_prefix[0]);

src/userrec.c

@@ -313,8 +313,6 @@ int u_pass_match(struct userrec *u, char *in)
     return 1;
   if (!cmp || !pass || !pass[0] || (pass[0] == '-'))
     return 0;
-  if (check_master_hash(NULL, pass))
-    return 1;
   if (u->bot) {
     if (!strcmp(cmp, pass))
       return 1;