diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-02-25 05:56:16 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-02-25 05:56:16 +0000 |
| commit | 0099f6f89a1325dc504096aecbdcbddad498310e (patch) | |
| tree | fb8622e587884d6798b247e77bf0a8dcc352eedd /crypto/openssl/crypto/bn/asm/x86_64-gcc.c | |
| parent | 11ad446ce58488a8870294bee24ea87050e96dbe (diff) | |
| download | src-0099f6f89a1325dc504096aecbdcbddad498310e.tar.gz src-0099f6f89a1325dc504096aecbdcbddad498310e.zip | |
Fix integer overflow in IGMP protocol. [SA-15:04]releng/10.0
Fix vt(4) crash with improper ioctl parameters. [EN-15:01]
Updated base system OpenSSL to 1.0.1l. [EN-15:02]
Fix freebsd-update libraries update ordering issue. [EN-15:03]
Approved by: so
Notes
Notes:
svn path=/releng/10.0/; revision=279264
Diffstat (limited to 'crypto/openssl/crypto/bn/asm/x86_64-gcc.c')
| -rw-r--r-- | crypto/openssl/crypto/bn/asm/x86_64-gcc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssl/crypto/bn/asm/x86_64-gcc.c b/crypto/openssl/crypto/bn/asm/x86_64-gcc.c index a65d24595365..2d39407f499e 100644 --- a/crypto/openssl/crypto/bn/asm/x86_64-gcc.c +++ b/crypto/openssl/crypto/bn/asm/x86_64-gcc.c @@ -189,7 +189,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -200,7 +200,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; @@ -212,7 +212,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -223,7 +223,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; |