Merge of main trunk, all conflicts resolved.

This commit is contained in:
Richard Levitte
2000-09-20 14:44:44 +00:00
parent a7ce1f0514
commit c200ff0446
36 changed files with 393 additions and 108 deletions

View File

@@ -417,7 +417,15 @@ bad:
goto end;
}
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);
}
#endif
}
else
{
if (BIO_write_filename(out,outfile) <= 0)
@@ -522,7 +530,7 @@ bad:
ret=0;
end:
if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free(out);
if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh);
EXIT(ret);
}