* Add salted_sha1() and remove obsoleted encrypt_pass()

src/crypt.c

@@ -133,13 +133,11 @@ void encrypt_cmd_pass(char *in, char *out)
   free(tmp);
 }
 
-char *encrypt_pass(struct userrec *u, char *in, const char *saltin)
+char *salted_sha1(const char *in, const char* saltin)
 {
   char *tmp = NULL, buf[101] = "", *ret = NULL;
   size_t ret_size = 0;
 
-  if (strlen(in) > MAXPASSLEN)
-    in[MAXPASSLEN] = 0;
 
   /* Create a 5 byte salt */
   char salt[6] = "";

src/crypt.h

@@ -25,7 +25,7 @@ unsigned char *decrypt_binary(const char *, unsigned char *, size_t *);
 char *encrypt_string(const char *, char *);
 char *decrypt_string(const char *, char *);
 void encrypt_cmd_pass(char *, char *);
-char *encrypt_pass(struct userrec *, char *, const char* = NULL);
+char *salted_sha1(const char *, const char* = NULL);
 char *cryptit (char *);
 char *decryptit (char *);
 int lfprintf (FILE *, const char *, ...) __attribute__((format(printf, 2, 3)));

src/userent.c

@@ -587,7 +587,7 @@ static bool pass_set(struct userrec *u, struct user_entry *e, void *buf)
     if (u->bot || (pass[0] == '+'))
       newpass = strdup(pass);
     else
-      newpass = encrypt_pass(u, pass);
+      newpass = salted_sha1(pass);
     e->u.extra = strdup(newpass);
   }
   if (!noshare)

src/userrec.c

@@ -343,7 +343,7 @@ int u_pass_match(struct userrec *u, char *in)
     strlcpy(pass, in, sizeof(pass));
 
     /* Pass the salted pass in so the same salt can be used */
-    char* newpass = encrypt_pass(u, in, &cmp[1]);
+    char* newpass = salted_sha1(pass, &cmp[1]);
     OPENSSL_cleanse(pass, sizeof(pass));
     if (!strcmp(cmp, newpass)) {
       free(newpass);