Update to OpenSSL 1.0.2.o

This commit is contained in:
Steve Dower
2018-04-13 17:29:45 +00:00
parent ccd3ab4aff
commit 4933cd8231
386 changed files with 5623 additions and 2984 deletions

View File

@@ -375,16 +375,18 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
}
if (bio == NULL) {
if (PKCS7_is_detached(p7))
if (PKCS7_is_detached(p7)) {
bio = BIO_new(BIO_s_null());
else if (os && os->length > 0)
} else if (os && os->length > 0) {
bio = BIO_new_mem_buf(os->data, os->length);
if (bio == NULL) {
} else {
bio = BIO_new(BIO_s_mem());
if (bio == NULL)
goto err;
BIO_set_mem_eof_return(bio, 0);
}
if (bio == NULL)
goto err;
}
if (out)
BIO_push(out, bio);