On 055, 02 24, 2007 at 08:25:23 +0100, Philipp Kolmann wrote:

Hi,

we are currently in the progress of switching an HPUX mailserver to linux and dovecot. The only issue so far is, that HPUX has bigcrypt for passwords > 8 chars. Bigcrypt uses standard libc crypt for every block of 8 chars.

The linux pam modules have a bigcrypt.c file which can be used for dovecot as well to authenticate crypt and bigcrypt passwords.

I have used the pam bigcrypt.c code to patch the mycrypt.c dovecot file.

I think your patch is wrong, it changes behavior of mycrypt() in incompatible way and introduces a memory leak. I think you need to create and use separate bigcrypt() function.

Maybe you could add this path (against branch_1_0 cvs).

thanks Philipp Kolmann

-- If you have problems in Windows: REBOOT If you have problems in Linux: BE ROOT

Index: src/auth/mycrypt.c =================================================================== RCS file: /home/cvs/dovecot/src/auth/mycrypt.c,v retrieving revision 1.10 diff -u -1 -b -p -r1.10 mycrypt.c --- src/auth/mycrypt.c 24 Feb 2006 16:42:47 -0000 1.10 +++ src/auth/mycrypt.c 24 Feb 2007 19:20:22 -0000 @@ -4,2 +4,32 @@

+/* Extended to be useable with bigcrypt passwords. + * Philipp Kolmann + * + * Code derived from pam modules/pam_unix/bigcrypt.c: + * + * This function implements the "bigcrypt" algorithm specifically for + * Linux-PAM. + * + * This algorithm is algorithm 0 (default) shipped with the C2 secure + * implementation of Digital UNIX. + * + * Disclaimer: This work is not based on the source code to Digital + * UNIX, nor am I connected to Digital Equipment Corp, in any way + * other than as a customer. This code is based on published + * interfaces and reasonable guesswork. + * + * Description: The cleartext is divided into blocks of SEGMENT_SIZE=8 + * characters or less. Each block is encrypted using the standard UNIX + * libc crypt function. The result of the encryption for one block + * provides the salt for the suceeding block. + * + * Restrictions: The buffer used to hold the encrypted result is + * statically allocated. (see MAX_PASS_LEN below). This is necessary, + * as the returned pointer points to "static data that are overwritten + * by each call", (XPG3: XSI System Interface + Headers pg 109), and + * this is a drop in replacement for crypt(); + * + * Andy Phillips + */ + #define _XOPEN_SOURCE 4 @@ -16,2 +46,17 @@ #include "mycrypt.h" +#include +#include + +/* + * Max cleartext password length in segments of 8 characters this + * function can deal with (16 segments of 8 chars= max 128 character + * password). + */ + +#define MAX_PASS_LEN 16 +#define SEGMENT_SIZE 8 +#define SALT_SIZE 2 +#define KEYBUF_SIZE ((MAX_PASS_LEN*SEGMENT_SIZE)+SALT_SIZE) +#define ESEGMENT_SIZE 11 +#define CBUF_SIZE ((MAX_PASS_LEN*ESEGMENT_SIZE)+SALT_SIZE+1)

@@ -19,3 +64,74 @@ char *mycrypt(const char *key, const cha { - return crypt(key, salt); + char *dec_c2_cryptbuf; + + unsigned long int keylen, n_seg, j; + char *cipher_ptr, *plaintext_ptr, *tmp_ptr, *salt_ptr; + char keybuf[KEYBUF_SIZE + 1]; + + /* reset arrays */ + dec_c2_cryptbuf = malloc(CBUF_SIZE);

Memory leak here. Dovecot doesn't call free() on the pointer returned by mycrypt().

+ if (!dec_c2_cryptbuf) { + return NULL; + } + memset(keybuf, 0, KEYBUF_SIZE + 1); + memset(dec_c2_cryptbuf, 0, CBUF_SIZE); + + /* fill KEYBUF_SIZE with key */ + strncpy(keybuf, key, KEYBUF_SIZE); + + /* deal with case that we are doing a password check for a + conventially encrypted password: the salt will be + SALT_SIZE+ESEGMENT_SIZE long. */ + if (strlen(salt) == (SALT_SIZE + ESEGMENT_SIZE)) + keybuf[SEGMENT_SIZE] = '\0'; /* terminate password early(?) */ + + keylen = strlen(keybuf); + + if (!keylen) { + n_seg = 1; + } else { + /* work out how many segments */ + n_seg = 1 + ((keylen - 1) / SEGMENT_SIZE); + } + + if (n_seg > MAX_PASS_LEN) + n_seg = MAX_PASS_LEN; /* truncate at max length */ + + /* set up some pointers */ + cipher_ptr = dec_c2_cryptbuf; + plaintext_ptr = keybuf; + + /* do the first block with supplied salt */ + tmp_ptr = crypt(plaintext_ptr, salt); /* libc crypt() */ + + /* and place in the static area */ + strncpy(cipher_ptr, tmp_ptr, 13); + cipher_ptr += ESEGMENT_SIZE + SALT_SIZE; + plaintext_ptr += SEGMENT_SIZE; /* first block of SEGMENT_SIZE */ + + /* change the salt (1st 2 chars of previous block) - this was found + by dowsing */ + + salt_ptr = cipher_ptr - ESEGMENT_SIZE; + + /* so far this is identical to "return crypt(key, salt);", if + there is more than one block encrypt them... */ + + if (n_seg > 1) { + for (j = 2; j <= n_seg; j++) { + + tmp_ptr = crypt(plaintext_ptr, salt_ptr); + + /* skip the salt for seg!=0 */ + strncpy(cipher_ptr, (tmp_ptr + SALT_SIZE), ESEGMENT_SIZE); + + cipher_ptr += ESEGMENT_SIZE; + plaintext_ptr += SEGMENT_SIZE; + salt_ptr = cipher_ptr - ESEGMENT_SIZE; + } + } + + /* this is the <NUL> terminated encrypted password */ + + return dec_c2_cryptbuf; } Index: src/auth/mycrypt.h =================================================================== RCS file: /home/cvs/dovecot/src/auth/mycrypt.h,v retrieving revision 1.1 diff -u -1 -b -p -r1.1 mycrypt.h --- src/auth/mycrypt.h 26 Nov 2002 18:39:57 -0000 1.1 +++ src/auth/mycrypt.h 24 Feb 2007 19:20:22 -0000 @@ -4,3 +4,5 @@ /* A simple wrapper to crypt(). Problem with it is that it requires - _XOPEN_SOURCE define which breaks other things. */ + _XOPEN_SOURCE define which breaks other things. + + Extended to work with bigcrypt passwords. */ char *mycrypt(const char *key, const char *salt);

-- Andrey Panin | Linux and UNIX system administrator pazke@donpac.ru | PGP key: wwwkeys.pgp.net