summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs7/pk7_doit.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-11-16 14:54:50 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-11-16 14:54:50 +0000
commit91895a5938695348ebfb6211325cc6e3e449e955 (patch)
tree5a463d058a32e9dedc970f6a96bb283a8bcf2d08 /crypto/pkcs7/pk7_doit.c
parent6d1b637ba149acfa59515a270d8b4f2ee621023f (diff)
Fix for a bug in PKCS#7 code and non-detached data.
Remove rc4-64 from ciphers since it doesn't exist...
Diffstat (limited to 'crypto/pkcs7/pk7_doit.c')
-rw-r--r--crypto/pkcs7/pk7_doit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 4c32f053b7..7feb01230e 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -226,7 +226,8 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
os=p7->d.sign->contents->d.data;
if (os->length > 0) bio =
BIO_new_mem_buf(os->data, os->length);
- } else {
+ }
+ if(bio == NULL) {
bio=BIO_new(BIO_s_mem());
BIO_set_mem_eof_return(bio,0);
}