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/bn/asm | |
| 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/bn/asm')
| -rw-r--r-- | crypto/openssl/crypto/bn/asm/ppc.pl | 2 | ||||
| -rw-r--r-- | crypto/openssl/crypto/bn/asm/x86_64-gcc.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/bn/asm/ppc.pl b/crypto/openssl/crypto/bn/asm/ppc.pl index 08e0053..806e53a 100644 --- a/crypto/openssl/crypto/bn/asm/ppc.pl +++ b/crypto/openssl/crypto/bn/asm/ppc.pl @@ -2074,5 +2074,7 @@ EOF $data =~ s/^(\s*)cmplw(\s+)([^,]+),(.*)/$1cmpl$2$3,0,$4/gm; # assembler X doesn't accept li, load immediate value #$data =~ s/^(\s*)li(\s+)([^,]+),(.*)/$1addi$2$3,0,$4/gm; + # assembler Y chokes on apostrophes in comments + $data =~ s/'//gm; return($data); } diff --git a/crypto/openssl/crypto/bn/asm/x86_64-gcc.c b/crypto/openssl/crypto/bn/asm/x86_64-gcc.c index 2b2bc1e..b1b8a11 100644 --- a/crypto/openssl/crypto/bn/asm/x86_64-gcc.c +++ b/crypto/openssl/crypto/bn/asm/x86_64-gcc.c @@ -59,6 +59,7 @@ #undef mul #undef mul_add +#undef sqr /* * "m"(a), "+m"(r) is the way to favor DirectPath µ-code; |
