diff options
| author | simon <simon@FreeBSD.org> | 2010-04-01 15:19:51 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-04-01 15:19:51 +0000 |
| commit | 2176e0cd52d68263d3d2ff39461442b734360fe1 (patch) | |
| tree | 9b9ed316e70ff8c7ea71526ab69ab131960e8b72 /crypto/openssl/crypto/bio | |
| parent | 348853b7ae1be0b9abbde8c1b0ad8dcb786a2cb7 (diff) | |
| download | FreeBSD-src-2176e0cd52d68263d3d2ff39461442b734360fe1.zip FreeBSD-src-2176e0cd52d68263d3d2ff39461442b734360fe1.tar.gz | |
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
Diffstat (limited to 'crypto/openssl/crypto/bio')
| -rw-r--r-- | crypto/openssl/crypto/bio/bss_file.c | 4 |
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 62c1073..47fa266 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 { |
