aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/bio
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-04-01 15:19:51 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-04-01 15:19:51 +0000
commitab8565e2671f6e9101b4b855b9614c95f0810eb6 (patch)
tree9b9ed316e70ff8c7ea71526ab69ab131960e8b72 /crypto/openssl/crypto/bio
parent094f117522350e3fddf5cdb671d3829999604765 (diff)
parent0cedaa6c89235ed396068f2ebf546c9a909439e1 (diff)
downloadsrc-ab8565e2671f6e9101b4b855b9614c95f0810eb6.tar.gz
src-ab8565e2671f6e9101b4b855b9614c95f0810eb6.zip
Merge OpenSSL 0.9.8n into head.
This fixes CVE-2010-0740 which only affected -CURRENT (OpenSSL 0.9.8m) but not -STABLE branches. I have not yet been able to find out if CVE-2010-0433 impacts FreeBSD. This will be investigated further. Security: CVE-2010-0433, CVE-2010-0740 Security: http://www.openssl.org/news/secadv_20100324.txt
Notes
Notes: svn path=/head/; revision=206046
Diffstat (limited to 'crypto/openssl/crypto/bio')
-rw-r--r--crypto/openssl/crypto/bio/bss_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/bio/bss_file.c b/crypto/openssl/crypto/bio/bss_file.c
index 62c10731d4a6..47fa266dfc48 100644
--- a/crypto/openssl/crypto/bio/bss_file.c
+++ b/crypto/openssl/crypto/bio/bss_file.c
@@ -272,9 +272,9 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_clear_flags(b,BIO_FLAGS_UPLINK);
#endif
#endif
-#ifdef UP_fsetmode
+#ifdef UP_fsetmod
if (b->flags&BIO_FLAGS_UPLINK)
- UP_fsetmode(b->ptr,num&BIO_FP_TEXT?'t':'b');
+ UP_fsetmod(b->ptr,(char)((num&BIO_FP_TEXT)?'t':'b'));
else
#endif
{