i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

steps towards ssl for smtp

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10469 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-12-16 00:32:54 +00:00
parent 34c6e0572b
commit 4dda1ae47d
5 changed files with 967 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+29 -20
View File
@@ -1,20 +1,29 @@
SubDir OBOS_TOP src add-ons mail_daemon outbound_protocols smtp ; SubDir OBOS_TOP src add-ons mail_daemon outbound_protocols smtp ;
UsePrivateHeaders mail ; UsePrivateHeaders mail ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
if $(BONE_COMPATIBLE) { if $(USESSL) {
SubDirC++Flags -DBONE ; SubDirC++Flags -DUSESSL ;
} else { SubDirHdrs [ FDirName / boot home config include ] ;
SubDirC++Flags -DBUILDING_R5_LIBNET ; }
}
if $(BONE_COMPATIBLE) {
Addon SMTP : mail_daemon outbound_protocols : SubDirC++Flags -DBONE ;
smtp.cpp } else {
md5c.c ; SubDirC++Flags -DBUILDING_R5_LIBNET ;
}
LinkSharedOSLibs SMTP : be libmail.so $(NETWORK_LIBS) ;
Addon SMTP : mail_daemon outbound_protocols :
Package haiku-maildaemon-cvs : smtp.cpp
SMTP : md5c.c ;
boot home config add-ons mail_daemon outbound_protocols ;
LinkSharedOSLibs SMTP : be libmail.so $(NETWORK_LIBS) ;
if $(USESSL) {
LinkSharedOSLibs SMTP : ssl crypto ;
}
Package haiku-maildaemon-cvs :
SMTP :
boot home config add-ons mail_daemon outbound_protocols ;
src/add-ons/mail_daemon/outbound_protocols/smtp/md5.h
+3 -9
View File
@@ -39,16 +39,10 @@ typedef struct {
unsigned char buffer[64]; /* input buffer */ unsigned char buffer[64]; /* input buffer */
} MD5_CTX; } MD5_CTX;
void MD5Init PROTO_LIST ((MD5_CTX *)); void MD5_Init PROTO_LIST ((MD5_CTX *));
void MD5Update PROTO_LIST void MD5_Update PROTO_LIST
((MD5_CTX *, unsigned char *, unsigned int)); ((MD5_CTX *, unsigned char *, unsigned int));
void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); void MD5_Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
void MD5Hmac(unsigned char *digest,
const unsigned char* text, int text_len,
const unsigned char* key, int key_len);
void MD5HexHmac(char *hexdigest,
const unsigned char* text, int text_len,
const unsigned char* key, int key_len);
#ifdef __cplusplus #ifdef __cplusplus
} }
src/add-ons/mail_daemon/outbound_protocols/smtp/md5c.c
+9 -96
View File
@@ -49,7 +49,7 @@ documentation and/or software.
#define S43 15 #define S43 15
#define S44 21 #define S44 21
static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64])); static void MD5_Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
static void Encode PROTO_LIST static void Encode PROTO_LIST
((unsigned char *, UINT4 *, unsigned int)); ((unsigned char *, UINT4 *, unsigned int));
static void Decode PROTO_LIST static void Decode PROTO_LIST
@@ -100,7 +100,7 @@ Rotation is separate from addition to prevent recomputation.
/* MD5 initialization. Begins an MD5 operation, writing a new context. /* MD5 initialization. Begins an MD5 operation, writing a new context.
*/ */
void MD5Init (MD5_CTX *context) void MD5_Init (MD5_CTX *context)
/* context */ /* context */
{ {
context->count[0] = context->count[1] = 0; context->count[0] = context->count[1] = 0;
@@ -116,7 +116,7 @@ void MD5Init (MD5_CTX *context)
operation, processing another message block, and updating the operation, processing another message block, and updating the
context. context.
*/ */
void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen) void MD5_Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
/* context */ /* context */
/* input block */ /* input block */
/* length of input block */ /* length of input block */
@@ -139,10 +139,10 @@ void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
if (inputLen >= partLen) { if (inputLen >= partLen) {
MD5_memcpy MD5_memcpy
((POINTER)&context->buffer[index], (POINTER)input, partLen); ((POINTER)&context->buffer[index], (POINTER)input, partLen);
MD5Transform (context->state, context->buffer); MD5_Transform (context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64) for (i = partLen; i + 63 < inputLen; i += 64)
MD5Transform (context->state, &input[i]); MD5_Transform (context->state, &input[i]);
index = 0; index = 0;
} }
@@ -158,7 +158,7 @@ void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
/* MD5 finalization. Ends an MD5 message-digest operation, writing the /* MD5 finalization. Ends an MD5 message-digest operation, writing the
the message digest and zeroizing the context. the message digest and zeroizing the context.
*/ */
void MD5Final (unsigned char digest[16], MD5_CTX *context) void MD5_Final (unsigned char digest[16], MD5_CTX *context)
/* message digest */ /* message digest */
/* context */ /* context */
{ {
@@ -172,10 +172,10 @@ void MD5Final (unsigned char digest[16], MD5_CTX *context)
*/ */
index = (unsigned int)((context->count[0] >> 3) & 0x3f); index = (unsigned int)((context->count[0] >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index); padLen = (index < 56) ? (56 - index) : (120 - index);
MD5Update (context, PADDING, padLen); MD5_Update (context, PADDING, padLen);
/* Append length (before padding) */ /* Append length (before padding) */
MD5Update (context, bits, 8); MD5_Update (context, bits, 8);
/* Store state in digest */ /* Store state in digest */
Encode (digest, context->state, 16); Encode (digest, context->state, 16);
@@ -186,7 +186,7 @@ void MD5Final (unsigned char digest[16], MD5_CTX *context)
/* MD5 basic transformation. Transforms state based on block. /* MD5 basic transformation. Transforms state based on block.
*/ */
static void MD5Transform (UINT4 state[4], unsigned char block[64]) static void MD5_Transform (UINT4 state[4], unsigned char block[64])
{ {
UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
@@ -321,90 +321,3 @@ static void MD5_memset (POINTER output, int value, unsigned int len)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
((char *)output)[i] = (char)value; ((char *)output)[i] = (char)value;
} }
/*
** Function: md5_hmac
** taken from the file rfc2104.txt
** written by Martin Schaaf <[email protected]>
*/
void
MD5Hmac(unsigned char *digest,
const unsigned char* text, int text_len,
const unsigned char* key, int key_len)
{
MD5_CTX context;
unsigned char k_ipad[64]; /* inner padding -
* key XORd with ipad
*/
unsigned char k_opad[64]; /* outer padding -
* key XORd with opad
*/
/* unsigned char tk[16]; */
int i;
/* start out by storing key in pads */
memset(k_ipad, 0, sizeof k_ipad);
memset(k_opad, 0, sizeof k_opad);
if (key_len > 64) {
/* if key is longer than 64 bytes reset it to key=MD5(key) */
MD5_CTX tctx;
MD5Init(&tctx);
MD5Update(&tctx, (unsigned char*)key, key_len);
MD5Final(k_ipad, &tctx);
MD5Final(k_opad, &tctx);
} else {
memcpy(k_ipad, key, key_len);
memcpy(k_opad, key, key_len);
}
/*
* the HMAC_MD5 transform looks like:
*
* MD5(K XOR opad, MD5(K XOR ipad, text))
*
* where K is an n byte key
* ipad is the byte 0x36 repeated 64 times
* opad is the byte 0x5c repeated 64 times
* and text is the data being protected
*/
/* XOR key with ipad and opad values */
for (i = 0; i < 64; i++) {
k_ipad[i] ^= 0x36;
k_opad[i] ^= 0x5c;
}
/*
* perform inner MD5
*/
MD5Init(&context); /* init context for 1st
* pass */
MD5Update(&context, k_ipad, 64); /* start with inner pad */
MD5Update(&context, (unsigned char*)text, text_len); /* then text of datagram */
MD5Final(digest, &context); /* finish up 1st pass */
/*
* perform outer MD5
*/
MD5Init(&context); /* init context for 2nd
* pass */
MD5Update(&context, k_opad, 64); /* start with outer pad */
MD5Update(&context, digest, 16); /* then results of 1st
* hash */
MD5Final(digest, &context); /* finish up 2nd pass */
}
void
MD5HexHmac(char *hexdigest,
const unsigned char* text, int text_len,
const unsigned char* key, int key_len)
{
unsigned char digest[16];
int i;
MD5Hmac(digest, text, text_len, key, key_len);
for (i = 0; i < 16; i++)
sprintf(hexdigest + 2 * i, "%02x", digest[i]);
}
src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+870 -678
View File
File diff suppressed because it is too large Load Diff
src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.h
+56 -44
View File
@@ -1,44 +1,56 @@
#ifndef ZOIDBERG_SMTP_H #ifndef ZOIDBERG_SMTP_H
#define ZOIDBERG_SMTP_H #define ZOIDBERG_SMTP_H
/* SMTPProtocol - implementation of the SMTP protocol /* SMTPProtocol - implementation of the SMTP protocol
** **
** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. ** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved.
*/ */
#include <String.h> #include <String.h>
#include <MailAddon.h> #include <MailAddon.h>
#ifdef USESSL
class SMTPProtocol : public BMailFilter { #include <openssl/ssl.h>
public: #include <openssl/rand.h>
SMTPProtocol(BMessage *message, BMailChainRunner *runner); #endif
~SMTPProtocol();
class SMTPProtocol : public BMailFilter {
virtual status_t InitCheck(BString *verbose); public:
virtual status_t ProcessMailMessage(BPositionIO **io_message, BEntry *io_entry, SMTPProtocol(BMessage *message, BMailChainRunner *runner);
BMessage *io_headers, BPath *io_folder, const char *io_uid); ~SMTPProtocol();
//----Perfectly good holdovers from the old days virtual status_t InitCheck(BString *verbose);
status_t Open(const char *server, int port, bool esmtp); virtual status_t ProcessMailMessage(BPositionIO **io_message, BEntry *io_entry,
status_t Login(const char *uid, const char *password); BMessage *io_headers, BPath *io_folder, const char *io_uid);
void Close();
status_t Send(const char *to, const char *from, BPositionIO *message); //----Perfectly good holdovers from the old days
status_t Open(const char *server, int port, bool esmtp);
int32 ReceiveResponse(BString &line); status_t Login(const char *uid, const char *password);
status_t SendCommand(const char *cmd); void Close();
status_t Send(const char *to, const char *from, BPositionIO *message);
private:
status_t POP3Authentification(); int32 ReceiveResponse(BString &line);
status_t SendCommand(const char *cmd);
int _fd;
BString fLog; private:
BMessage *fSettings; status_t POP3Authentification();
BMailChainRunner *runner;
int32 fAuthType; int _fd;
BString fLog;
status_t fStatus; BMessage *fSettings;
}; BMailChainRunner *runner;
int32 fAuthType;
#endif /* ZOIDBERG_SMTP_H */
#ifdef USESSL
SSL_CTX *ctx;
SSL *ssl;
BIO *sbio;
bool use_ssl;
#endif
status_t fStatus;
};
#endif /* ZOIDBERG_SMTP_H */