+2006-03-28 [colin] 2.0.0cvs179
+
+ * src/common/smtp.c
+ * src/common/passcrypt.c
+ * src/undo.c
+ Warning fixes. Patch by Pawel Pekala
+
2006-03-27 [colin] 2.0.0cvs178
* src/undo.c
( cvs diff -u -r 1.395.2.188 -r 1.395.2.189 src/summaryview.c; ) > 2.0.0cvs176.patchset
( cvs diff -u -r 1.96.2.104 -r 1.96.2.105 src/textview.c; ) > 2.0.0cvs177.patchset
( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/undo.c; ) > 2.0.0cvs178.patchset
+( cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/common/smtp.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/passcrypt.c; cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/undo.c; ) > 2.0.0cvs179.patchset
void crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
unsigned chunksize, int decrypt);
-static void crypt_cfb_shift(unsigned char *to,
- const unsigned char *from, unsigned len);
-static void crypt_cfb_xor(unsigned char *to, const unsigned char *from,
- unsigned len);
-static void crypt_unpack(unsigned char *a);
void passcrypt_encrypt(gchar *password, guint len)
{
ecb_crypt(des_key, buf, len, DES_ENCRYPT);
}
#else
+static void crypt_cfb_shift(unsigned char *to,
+ const unsigned char *from, unsigned len);
+static void crypt_cfb_xor(unsigned char *to, const unsigned char *from,
+ unsigned len);
+static void crypt_unpack(unsigned char *a);
+
void
crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
unsigned chunksize, int decrypt)
buf += chunksize;
}
}
-#endif
/*
* Shift len bytes from end of to buffer to beginning, then put len
for (j = 7; j >= 0; --j)
a[(i << 3) + j] = (a[i] & (0x80 >> j)) != 0;
}
+#endif
static void smtp_session_destroy(Session *session);
static gint smtp_auth(SMTPSession *session);
+#if USE_OPENSSL
static gint smtp_starttls(SMTPSession *session);
+#endif
static gint smtp_auth_cram_md5(SMTPSession *session);
static gint smtp_auth_login(SMTPSession *session);
static gint smtp_auth_plain(SMTPSession *session);
return SM_ERROR;
}
+#if USE_OPENSSL
static gint smtp_starttls(SMTPSession *session)
{
session->state = SMTP_STARTTLS;
return SM_OK;
}
+#endif
static gint smtp_auth_cram_md5(SMTPSession *session)
{
}
if (action == UNDO_ACTION_DELETE) {
- gboolean checkit = TRUE;
-
if (last_undo->start_pos != end_pos &&
last_undo->start_pos != start_pos) {
last_undo->mergeable = FALSE;