diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
| commit | 0cedaa6c89235ed396068f2ebf546c9a909439e1 (patch) | |
| tree | ea91d9b180fa36b1886b046a286630c089f57475 /crypto/bn | |
| parent | f7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff) | |
Import OpenSSL 0.9.8n.vendor/openssl/0.9.8n
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=206035
svn path=/vendor-crypto/openssl/0.9.8n/; revision=206037; tag=vendor/openssl/0.9.8n
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/asm/ppc.pl | 2 | ||||
| -rw-r--r-- | crypto/bn/asm/x86_64-gcc.c | 1 | ||||
| -rw-r--r-- | crypto/bn/bn_div.c | 10 |
3 files changed, 11 insertions, 2 deletions
diff --git a/crypto/bn/asm/ppc.pl b/crypto/bn/asm/ppc.pl index 08e005347388..806e53ad6e1d 100644 --- a/crypto/bn/asm/ppc.pl +++ b/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/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c index 2b2bc1ef60a1..b1b8a1109bf7 100644 --- a/crypto/bn/asm/x86_64-gcc.c +++ b/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; diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c index 7c35545354ee..78c6507113bf 100644 --- a/crypto/bn/bn_div.c +++ b/crypto/bn/bn_div.c @@ -337,7 +337,10 @@ X) -> 0x%08X\n", t2 -= d1; } #else /* !BN_LLONG */ - BN_ULONG t2l,t2h,ql,qh; + BN_ULONG t2l,t2h; +#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) + BN_ULONG ql,qh; +#endif q=bn_div_words(n0,n1,d0); #ifdef BN_DEBUG_LEVITTE @@ -561,7 +564,10 @@ X) -> 0x%08X\n", t2 -= d1; } #else /* !BN_LLONG */ - BN_ULONG t2l,t2h,ql,qh; + BN_ULONG t2l,t2h; +#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) + BN_ULONG ql,qh; +#endif q=bn_div_words(n0,n1,d0); #ifdef BN_DEBUG_LEVITTE |