Support for smime-type MIME parameter.

[openssl.git] / crypto / pkcs7 / pk7_mime.c

diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 4630e3180d4915d0bb2df92d0b491b0c9bf51b1b..134746c1864f4da4461cfb271b0b29fc6bea95aa 100644 (file)
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -3,7 +3,7 @@
  * project.
  */
 /* ====================================================================
- * Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -102,7 +102,7 @@ static int mime_param_cmp(const MIME_PARAM * const *a,
 static void mime_param_free(MIME_PARAM *param);
 static int mime_bound_check(char *line, int linelen, char *bound, int blen);
 static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret);
-static int iscrlf(char c);
+static int strip_eol(char *linebuf, int *plen);
 static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, char *name);
 static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, char *name);
 static void mime_hdr_free(MIME_HEADER *hdr);
@@ -110,9 +110,6 @@ static void mime_hdr_free(MIME_HEADER *hdr);
 #define MAX_SMLEN 1024
 #define mime_debug(x) /* x */
 
-
-typedef void (*stkfree)();
-
 /* Base 64 read and write of PKCS#7 structure */
 
 static int B64_write_PKCS7(BIO *bio, PKCS7 *p7)
@@ -153,11 +150,12 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
 {
        char bound[33], c;
        int i;
-       char *mime_prefix, *mime_eol;
+       char *mime_prefix, *mime_eol, *msg_type=NULL;
        if (flags & PKCS7_NOOLDMIMETYPE)
                mime_prefix = "application/pkcs7-";
        else
                mime_prefix = "application/x-pkcs7-";
+
        if (flags & PKCS7_CRLFEOL)
                mime_eol = "\r\n";
        else
@@ -199,11 +197,30 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
                                                        mime_eol, mime_eol);
                return 1;
        }
+
+       /* Determine smime-type header */
+
+       if (PKCS7_type_is_enveloped(p7))
+               msg_type = "enveloped-data";
+       else if (PKCS7_type_is_signed(p7))
+               {
+               /* If we have any signers it is signed-data othewise 
+                * certs-only.
+                */
+               STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
+               sinfos = PKCS7_get_signer_info(p7);
+               if (sk_PKCS7_SIGNER_INFO_num(sinfos) > 0)
+                       msg_type = "signed-data";
+               else
+                       msg_type = "certs-only";
+               }
        /* MIME headers */
        BIO_printf(bio, "MIME-Version: 1.0%s", mime_eol);
        BIO_printf(bio, "Content-Disposition: attachment;");
        BIO_printf(bio, " filename=\"smime.p7m\"%s", mime_eol);
        BIO_printf(bio, "Content-Type: %smime;", mime_prefix);
+       if (msg_type)
+               BIO_printf(bio, " smime-type=%s;", msg_type);
        BIO_printf(bio, " name=\"smime.p7m\"%s", mime_eol);
        BIO_printf(bio, "Content-Transfer-Encoding: base64%s%s",
                                                mime_eol, mime_eol);
@@ -239,14 +256,13 @@ static int pkcs7_output_data(BIO *out, BIO *data, PKCS7 *p7, int flags)
        /* Finalize signatures */
        PKCS7_dataFinal(p7, p7bio);
 
-       /* Now remove any digests from output BIO */
+       /* Now remove any digests prepended to the BIO */
 
-       while (1)
+       while (p7bio != out)
                {
                tmpbio = BIO_pop(p7bio);
-               if (tmpbio == out)
-                       break;
-               BIO_free(tmpbio);
+               BIO_free(p7bio);
+               p7bio = tmpbio;
                }
 
        return 1;
@@ -375,11 +391,7 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
        if(flags & PKCS7_TEXT)
                BIO_printf(out, "Content-Type: text/plain\r\n\r\n");
        while ((len = BIO_gets(in, linebuf, MAX_SMLEN)) > 0) {
-               eol = 0;
-               while(len && iscrlf(linebuf[len - 1])) {
-                       len--;
-                       eol = 1;
-               }
+               eol = strip_eol(linebuf, &len);
                if (len)
                        BIO_write(out, linebuf, len);
                if(eol) BIO_write(out, "\r\n", 2);
@@ -445,15 +457,12 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
                        return 1;
                } else if(part) {
                        /* Strip CR+LF from linebuf */
-                       next_eol = 0;
-                       while(len && iscrlf(linebuf[len - 1])) {
-                               next_eol = 1;
-                               len--;
-                       }
+                       next_eol = strip_eol(linebuf, &len);
                        if(first) {
                                first = 0;
                                if(bpart) sk_BIO_push(parts, bpart);
                                bpart = BIO_new(BIO_s_mem());
+                               BIO_set_mem_eof_return(bpart, 0);
                        } else if (eol)
                                BIO_write(bpart, "\r\n", 2);
                        eol = next_eol;
@@ -464,12 +473,6 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
        return 0;
 }
 
-static int iscrlf(char c)
-{
-       if(c == '\r' || c == '\n') return 1;
-       return 0;
-}
-
 /* This is the big one: parse MIME header lines up to message body */
 
 #define MIME_INVALID   0
@@ -750,3 +753,21 @@ static int mime_bound_check(char *line, int linelen, char *bound, int blen)
        }
        return 0;
 }
+
+static int strip_eol(char *linebuf, int *plen)
+       {
+       int len = *plen;
+       char *p, c;
+       int is_eol = 0;
+       p = linebuf + len - 1;
+       for (p = linebuf + len - 1; len > 0; len--, p--)
+               {
+               c = *p;
+               if (c == '\n')
+                       is_eol = 1;
+               else if (c != '\r')
+                       break;
+               }
+       *plen = len;
+       return is_eol;
+       }