[dovecot-cvs]
dovecot/src/auth mech-cram-md5.c,1.2,1.3 passdb.c,1.12,1.13
password-scheme-cram-md5.c,1.1,1.2 password-scheme.c,1.4,1.5
cras at procontrol.fi
cras at procontrol.fi
Tue Nov 11 11:59:29 EET 2003
Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv28039/src/auth
Modified Files:
mech-cram-md5.c passdb.c password-scheme-cram-md5.c
password-scheme.c
Log Message:
cram-md5 updates.
Index: mech-cram-md5.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/mech-cram-md5.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mech-cram-md5.c 10 Nov 2003 21:44:54 -0000 1.2
+++ mech-cram-md5.c 11 Nov 2003 09:59:27 -0000 1.3
@@ -32,7 +32,7 @@
static const char *get_cram_challenge(void)
{
- char buf[17];
+ unsigned char buf[17];
size_t i;
hostpid_init();
@@ -42,8 +42,8 @@
buf[i] = (buf[i] % 10) + '0';
buf[sizeof(buf)-1] = '\0';
- return t_strdup_printf("%s.%s@%s", buf, dec2str(ioloop_time),
- my_hostname);
+ return t_strdup_printf("<%s.%s@%s>", (const char *) buf,
+ dec2str(ioloop_time), my_hostname);
}
static int verify_credentials(struct cram_auth_request *auth,
Index: passdb.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/passdb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- passdb.c 10 Nov 2003 20:36:02 -0000 1.12
+++ passdb.c 11 Nov 2003 09:59:27 -0000 1.13
@@ -25,7 +25,7 @@
case PASSDB_CREDENTIALS_CRYPT:
return "CRYPT";
case PASSDB_CREDENTIALS_CRAM_MD5:
- return "CRAM-MD5";
+ return "HMAC-MD5";
case PASSDB_CREDENTIALS_DIGEST_MD5:
return "DIGEST-MD5";
}
Index: password-scheme-cram-md5.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/password-scheme-cram-md5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- password-scheme-cram-md5.c 10 Nov 2003 20:36:02 -0000 1.1
+++ password-scheme-cram-md5.c 11 Nov 2003 09:59:27 -0000 1.2
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Timo Sirainen */
+/* Copyright (C) 2003 Timo Sirainen / Joshua Goodall */
#include "lib.h"
#include "md5.h"
Index: password-scheme.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/password-scheme.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- password-scheme.c 10 Nov 2003 20:36:02 -0000 1.4
+++ password-scheme.c 11 Nov 2003 09:59:27 -0000 1.5
@@ -30,6 +30,11 @@
if (strcasecmp(scheme, "PLAIN") == 0)
return strcmp(password, plaintext) == 0;
+ if (strcasecmp(scheme, "HMAC-MD5") == 0) {
+ str = password_generate_cram_md5(plaintext);
+ return strcmp(str, password) == 0;
+ }
+
if (strcasecmp(scheme, "DIGEST-MD5") == 0) {
/* user:realm:passwd */
realm = strchr(user, '@');
@@ -110,7 +115,7 @@
if (strcasecmp(scheme, "PLAIN") == 0)
return plaintext;
- if (strcasecmp(scheme, "CRAM-MD5") == 0)
+ if (strcasecmp(scheme, "HMAC-MD5") == 0)
return password_generate_cram_md5(plaintext);
if (strcasecmp(scheme, "DIGEST-MD5") == 0) {
More information about the dovecot-cvs
mailing list