diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-28 14:11:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-28 14:11:19 +0000 |
| commit | 82b931860a6931f7c1711169b547c44a3e01d3d1 (patch) | |
| tree | a81f19deb713a6f528af779e745275a7fcbf62da | |
| parent | 11750113c62b61ac152f581c28691927ecf59729 (diff) | |
| download | openssl-new-82b931860a6931f7c1711169b547c44a3e01d3d1.tar.gz | |
Ouch! PKCS7_encrypt() was heading MIME text headers twice
because it added them manually and as part of SMIME_crlf_copy().
Removed the manual add.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 7 |
2 files changed, 4 insertions, 7 deletions
@@ -4,6 +4,10 @@ Changes between 0.9.4 and 0.9.5 [28 Feb 2000] + *) PKCS7_encrypt() was adding text MIME headers twice because they + were added manually and by SMIME_crlf_copy(). + [Steve Henson] + *) In bntest.c don't call BN_rand with zero bits argument. [Steve Henson, pointed out by Andrew W. Gray <agray@iconsinc.com>] diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index 17e51941c7..b41f42ed04 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -329,7 +329,6 @@ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher, BIO *p7bio = NULL; int i; X509 *x509; - static char txthdr[] = "Content-type: text/plain\r\n\r\n"; if(!(p7 = PKCS7_new())) { PKCS7err(PKCS7_F_PKCS7_ENCRYPT,ERR_R_MALLOC_FAILURE); return NULL; @@ -355,12 +354,6 @@ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher, goto err; } - if(flags & PKCS7_TEXT) { - if(BIO_write(p7bio, txthdr, sizeof(txthdr) - 1) < 0) { - goto err; - } - } - SMIME_crlf_copy(in, p7bio, flags); BIO_flush(p7bio); |