Various fixes...

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

diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 0ba7d77462ab56417cd6e9a8c7c6cec07ef19d39..a7b692943646a241b55aed7cb70f948bed7d4c8d 100644 (file)
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -75,37 +75,6 @@ char *param_value;                   /* Param value e.g. "sha1" */
 } MIME_PARAM;
 
 DECLARE_STACK_OF(MIME_PARAM)
 } MIME_PARAM;
 
 DECLARE_STACK_OF(MIME_PARAM)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_MIME_PARAM_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_MIME_PARAM_new_null() sk_new_null()
-       #define sk_MIME_PARAM_free(a) sk_free(a)
-       #define sk_MIME_PARAM_num(a) sk_num(a)
-       #define sk_MIME_PARAM_value(a,b) ((MIME_PARAM *) \
-               sk_value((a),(b)))
-       #define sk_MIME_PARAM_set(a,b,c) ((MIME_PARAM *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_MIME_PARAM_zero(a) sk_zero(a)
-       #define sk_MIME_PARAM_push(a,b) sk_push((a),(char *)(b))
-       #define sk_MIME_PARAM_unshift(a,b) sk_unshift((a),(b))
-       #define sk_MIME_PARAM_find(a,b) sk_find((a), (char *)(b))
-       #define sk_MIME_PARAM_delete(a,b) ((MIME_PARAM *) \
-               sk_delete((a),(b)))
-       #define sk_MIME_PARAM_delete_ptr(a,b) ((MIME_PARAM *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_MIME_PARAM_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_MIME_PARAM_set_cmp_func(a,b) ((int (*) \
-               (const MIME_PARAM * const *,const MIME_PARAM * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_MIME_PARAM_dup(a) sk_dup(a)
-       #define sk_MIME_PARAM_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_MIME_PARAM_shift(a) ((MIME_PARAM *)sk_shift(a))
-       #define sk_MIME_PARAM_pop(a) ((MIME_PARAM *)sk_pop(a))
-       #define sk_MIME_PARAM_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 IMPLEMENT_STACK_OF(MIME_PARAM)
 
 typedef struct {
 IMPLEMENT_STACK_OF(MIME_PARAM)
 
 typedef struct {


@@ -115,37 +84,6 @@ STACK_OF(MIME_PARAM) *params;               /* Zero or more parameters */
 } MIME_HEADER;
 
 DECLARE_STACK_OF(MIME_HEADER)
 } MIME_HEADER;
 
 DECLARE_STACK_OF(MIME_HEADER)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_MIME_HEADER_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_MIME_HEADER_new_null() sk_new_null()
-       #define sk_MIME_HEADER_free(a) sk_free(a)
-       #define sk_MIME_HEADER_num(a) sk_num(a)
-       #define sk_MIME_HEADER_value(a,b) ((MIME_HEADER *) \
-               sk_value((a),(b)))
-       #define sk_MIME_HEADER_set(a,b,c) ((MIME_HEADER *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_MIME_HEADER_zero(a) sk_zero(a)
-       #define sk_MIME_HEADER_push(a,b) sk_push((a),(char *)(b))
-       #define sk_MIME_HEADER_unshift(a,b) sk_unshift((a),(b))
-       #define sk_MIME_HEADER_find(a,b) sk_find((a), (char *)(b))
-       #define sk_MIME_HEADER_delete(a,b) ((MIME_HEADER *) \
-               sk_delete((a),(b)))
-       #define sk_MIME_HEADER_delete_ptr(a,b) ((MIME_HEADER *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_MIME_HEADER_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_MIME_HEADER_set_cmp_func(a,b) ((int (*) \
-               (const MIME_HEADER * const *,const MIME_HEADER * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_MIME_HEADER_dup(a) sk_dup(a)
-       #define sk_MIME_HEADER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_MIME_HEADER_shift(a) ((MIME_HEADER *)sk_shift(a))
-       #define sk_MIME_HEADER_pop(a) ((MIME_HEADER *)sk_pop(a))
-       #define sk_MIME_HEADER_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 IMPLEMENT_STACK_OF(MIME_HEADER)
 
 static int B64_write_PKCS7(BIO *bio, PKCS7 *p7);
 IMPLEMENT_STACK_OF(MIME_HEADER)
 
 static int B64_write_PKCS7(BIO *bio, PKCS7 *p7);


@@ -232,7 +170,7 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
                BIO_printf(bio, "micalg=sha1 ; boundary=\"----%s\"\n\n", bound);
                BIO_printf(bio, "This is an S/MIME signed message\n\n");
                /* Now write out the first part */
                BIO_printf(bio, "micalg=sha1 ; boundary=\"----%s\"\n\n", bound);
                BIO_printf(bio, "This is an S/MIME signed message\n\n");
                /* Now write out the first part */

-               BIO_printf(bio, "------%s\r\n", bound);
+               BIO_printf(bio, "------%s\n", bound);

                if(flags & PKCS7_TEXT) BIO_printf(bio, "Content-Type: text/plain\n\n");
                while((i = BIO_read(data, linebuf, MAX_SMLEN)) > 0) 
                                                BIO_write(bio, linebuf, i);
                if(flags & PKCS7_TEXT) BIO_printf(bio, "Content-Type: text/plain\n\n");
                while((i = BIO_read(data, linebuf, MAX_SMLEN)) > 0) 
                                                BIO_write(bio, linebuf, i);


@@ -641,7 +579,7 @@ static MIME_HEADER *mime_hdr_new(char *name, char *value)
                        }
                }
        } else tmpval = NULL;
                        }
                }
        } else tmpval = NULL;

-       mhdr = (MIME_HEADER *) Malloc(sizeof(MIME_HEADER));
+       mhdr = (MIME_HEADER *) OPENSSL_malloc(sizeof(MIME_HEADER));

        if(!mhdr) return NULL;
        mhdr->name = tmpname;
        mhdr->value = tmpval;
        if(!mhdr) return NULL;
        mhdr->name = tmpname;
        mhdr->value = tmpval;


@@ -670,7 +608,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value)
                if(!tmpval) return 0;
        } else tmpval = NULL;
        /* Parameter values are case sensitive so leave as is */
                if(!tmpval) return 0;
        } else tmpval = NULL;
        /* Parameter values are case sensitive so leave as is */

-       mparam = (MIME_PARAM *) Malloc(sizeof(MIME_PARAM));
+       mparam = (MIME_PARAM *) OPENSSL_malloc(sizeof(MIME_PARAM));

        if(!mparam) return 0;
        mparam->param_name = tmpname;
        mparam->param_value = tmpval;
        if(!mparam) return 0;
        mparam->param_name = tmpname;
        mparam->param_value = tmpval;


@@ -714,17 +652,17 @@ static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, char *name)
 
 static void mime_hdr_free(MIME_HEADER *hdr)
 {
 
 static void mime_hdr_free(MIME_HEADER *hdr)
 {

-       if(hdr->name) Free(hdr->name);
-       if(hdr->value) Free(hdr->value);
+       if(hdr->name) OPENSSL_free(hdr->name);
+       if(hdr->value) OPENSSL_free(hdr->value);

        if(hdr->params) sk_MIME_PARAM_pop_free(hdr->params, mime_param_free);
        if(hdr->params) sk_MIME_PARAM_pop_free(hdr->params, mime_param_free);

-       Free(hdr);
+       OPENSSL_free(hdr);

 }
 
 static void mime_param_free(MIME_PARAM *param)
 {
 }
 
 static void mime_param_free(MIME_PARAM *param)
 {

-       if(param->param_name) Free(param->param_name);
-       if(param->param_value) Free(param->param_value);
-       Free(param);
+       if(param->param_name) OPENSSL_free(param->param_name);
+       if(param->param_value) OPENSSL_free(param->param_value);
+       OPENSSL_free(param);

 }
 
 /* Check for a multipart boundary. Returns:
 }
 
 /* Check for a multipart boundary. Returns: