mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-25 11:03:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ouch! PKCS7_encrypt() was heading MIME text headers twice

Browse Source 
because it added them manually and as part of SMIME_crlf_copy().
Removed the manual add.
This commit is contained in:
Dr. Stephen Henson 2000-02-28 14:11:19 +00:00
parent 11750113c6
commit 82b931860a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -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>]

7
crypto/pkcs7/pk7_smime.c
View File

@ -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);