spool.c: bzero contents of pointer

[people/ms/dma.git] / crypto.c

diff --git a/crypto.c b/crypto.c
index f96797ca32e74ba39d0e762a3a303d85a8576f4f..7e8865c602464e75b1b581908157adc450dcdbc2 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -80,7 +80,7 @@ int
 smtp_init_crypto(int fd, int feature)
 {
        SSL_CTX *ctx = NULL;
-       SSL_METHOD *meth = NULL;
+       const SSL_METHOD *meth = NULL;
        X509 *cert;
        int error;
 
@@ -118,10 +118,13 @@ smtp_init_crypto(int fd, int feature)
                if (read_remote(fd, 0, NULL) == 2) {
                        send_remote_command(fd, "STARTTLS");
                        if (read_remote(fd, 0, NULL) != 2) {
-                               syslog(LOG_ERR, "remote delivery deferred:"
-                                 " STARTTLS not available: %s", neterr);
-                               config.features &= ~NOSSL;
-                               return (1);
+                               if ((feature & TLS_OPP) == 0) {
+                                       syslog(LOG_ERR, "remote delivery deferred: STARTTLS not available: %s", neterr);
+                                       return (1);
+                               } else {
+                                       syslog(LOG_INFO, "in opportunistic TLS mode, STARTTLS not available: %s", neterr);
+                                       return (0);
+                               }
                        }
                }
                /* End of TLS init phase, enable SSL_write/read */
@@ -177,7 +180,7 @@ smtp_init_crypto(int fd, int feature)
  */
 void
 hmac_md5(unsigned char *text, int text_len, unsigned char *key, int key_len,
-    caddr_t digest)
+    unsigned char* digest)
 {
         MD5_CTX context;
         unsigned char k_ipad[65];    /* inner padding -
@@ -249,7 +252,8 @@ hmac_md5(unsigned char *text, int text_len, unsigned char *key, int key_len,
 int
 smtp_auth_md5(int fd, char *login, char *password)
 {
-       unsigned char buffer[BUF_SIZE], digest[BUF_SIZE], ascii_digest[33];
+       unsigned char digest[BUF_SIZE];
+       char buffer[BUF_SIZE], ascii_digest[33];
        char *temp;
        int len, i;
        static char hextab[] = "0123456789abcdef";
@@ -262,15 +266,17 @@ smtp_auth_md5(int fd, char *login, char *password)
        /* Send AUTH command according to RFC 2554 */
        send_remote_command(fd, "AUTH CRAM-MD5");
        if (read_remote(fd, sizeof(buffer), buffer) != 3) {
-               syslog(LOG_DEBUG, "smarthost authentification:"
+               syslog(LOG_DEBUG, "smarthost authentication:"
                       " AUTH cram-md5 not available: %s", neterr);
                /* if cram-md5 is not available */
+               free(temp);
                return (-1);
        }
 
        /* skip 3 char status + 1 char space */
        base64_decode(buffer + 4, temp);
-       hmac_md5(temp, strlen(temp), password, strlen(password), digest);
+       hmac_md5((unsigned char *)temp, strlen(temp),
+                (unsigned char *)password, strlen(password), digest);
        free(temp);
 
        ascii_digest[32] = 0;