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/config | |
| 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/config')
| -rwxr-xr-x | crypto/openssl/config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/config b/crypto/openssl/config index 4d789df..b9d1c7a 100755 --- a/crypto/openssl/config +++ b/crypto/openssl/config @@ -741,6 +741,10 @@ case "$GUESSOS" in OBJECT_MODE=${OBJECT_MODE:-32} if [ "$CC" = "gcc" ]; then OUT="aix-gcc" + if [ $OBJECT_MODE -eq 64 ]; then + echo 'Your $OBJECT_MODE was found to be set to 64' + OUT="aix64-gcc" + fi elif [ $OBJECT_MODE -eq 64 ]; then echo 'Your $OBJECT_MODE was found to be set to 64' OUT="aix64-cc" |
