diff options
| author | miod <> | 2014-05-01 20:40:55 +0000 |
|---|---|---|
| committer | miod <> | 2014-05-01 20:40:55 +0000 |
| commit | 731ac4ae6c4e15ad6891ca0d8a94573d31a90041 (patch) | |
| tree | fa757ef2efeae5fd587c7ac1552ef23feb887232 /src | |
| parent | 57c484a02924a5d440d8b93723fc12febd430604 (diff) | |
| download | openbsd-731ac4ae6c4e15ad6891ca0d8a94573d31a90041.tar.gz openbsd-731ac4ae6c4e15ad6891ca0d8a94573d31a90041.tar.bz2 openbsd-731ac4ae6c4e15ad6891ca0d8a94573d31a90041.zip | |
Pass -Werror in the !BN_LLONG !BN_UMULT_LOHI !BN_UMULT_HIGH case.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_asm.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bn/bn_asm.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/bn/bn_asm.c b/src/lib/libcrypto/bn/bn_asm.c index c43c91cc09..f1a0944089 100644 --- a/src/lib/libcrypto/bn/bn_asm.c +++ b/src/lib/libcrypto/bn/bn_asm.c | |||
| @@ -558,7 +558,7 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) | |||
| 558 | { | 558 | { |
| 559 | #ifdef BN_LLONG | 559 | #ifdef BN_LLONG |
| 560 | BN_ULLONG t; | 560 | BN_ULLONG t; |
| 561 | #else | 561 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 562 | BN_ULONG bl,bh; | 562 | BN_ULONG bl,bh; |
| 563 | #endif | 563 | #endif |
| 564 | BN_ULONG t1,t2; | 564 | BN_ULONG t1,t2; |
| @@ -667,7 +667,7 @@ void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) | |||
| 667 | { | 667 | { |
| 668 | #ifdef BN_LLONG | 668 | #ifdef BN_LLONG |
| 669 | BN_ULLONG t; | 669 | BN_ULLONG t; |
| 670 | #else | 670 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 671 | BN_ULONG bl,bh; | 671 | BN_ULONG bl,bh; |
| 672 | #endif | 672 | #endif |
| 673 | BN_ULONG t1,t2; | 673 | BN_ULONG t1,t2; |
| @@ -712,7 +712,7 @@ void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a) | |||
| 712 | { | 712 | { |
| 713 | #ifdef BN_LLONG | 713 | #ifdef BN_LLONG |
| 714 | BN_ULLONG t,tt; | 714 | BN_ULLONG t,tt; |
| 715 | #else | 715 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 716 | BN_ULONG bl,bh; | 716 | BN_ULONG bl,bh; |
| 717 | #endif | 717 | #endif |
| 718 | BN_ULONG t1,t2; | 718 | BN_ULONG t1,t2; |
| @@ -793,7 +793,7 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) | |||
| 793 | { | 793 | { |
| 794 | #ifdef BN_LLONG | 794 | #ifdef BN_LLONG |
| 795 | BN_ULLONG t,tt; | 795 | BN_ULLONG t,tt; |
| 796 | #else | 796 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 797 | BN_ULONG bl,bh; | 797 | BN_ULONG bl,bh; |
| 798 | #endif | 798 | #endif |
| 799 | BN_ULONG t1,t2; | 799 | BN_ULONG t1,t2; |
diff --git a/src/lib/libssl/src/crypto/bn/bn_asm.c b/src/lib/libssl/src/crypto/bn/bn_asm.c index c43c91cc09..f1a0944089 100644 --- a/src/lib/libssl/src/crypto/bn/bn_asm.c +++ b/src/lib/libssl/src/crypto/bn/bn_asm.c | |||
| @@ -558,7 +558,7 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) | |||
| 558 | { | 558 | { |
| 559 | #ifdef BN_LLONG | 559 | #ifdef BN_LLONG |
| 560 | BN_ULLONG t; | 560 | BN_ULLONG t; |
| 561 | #else | 561 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 562 | BN_ULONG bl,bh; | 562 | BN_ULONG bl,bh; |
| 563 | #endif | 563 | #endif |
| 564 | BN_ULONG t1,t2; | 564 | BN_ULONG t1,t2; |
| @@ -667,7 +667,7 @@ void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) | |||
| 667 | { | 667 | { |
| 668 | #ifdef BN_LLONG | 668 | #ifdef BN_LLONG |
| 669 | BN_ULLONG t; | 669 | BN_ULLONG t; |
| 670 | #else | 670 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 671 | BN_ULONG bl,bh; | 671 | BN_ULONG bl,bh; |
| 672 | #endif | 672 | #endif |
| 673 | BN_ULONG t1,t2; | 673 | BN_ULONG t1,t2; |
| @@ -712,7 +712,7 @@ void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a) | |||
| 712 | { | 712 | { |
| 713 | #ifdef BN_LLONG | 713 | #ifdef BN_LLONG |
| 714 | BN_ULLONG t,tt; | 714 | BN_ULLONG t,tt; |
| 715 | #else | 715 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 716 | BN_ULONG bl,bh; | 716 | BN_ULONG bl,bh; |
| 717 | #endif | 717 | #endif |
| 718 | BN_ULONG t1,t2; | 718 | BN_ULONG t1,t2; |
| @@ -793,7 +793,7 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) | |||
| 793 | { | 793 | { |
| 794 | #ifdef BN_LLONG | 794 | #ifdef BN_LLONG |
| 795 | BN_ULLONG t,tt; | 795 | BN_ULLONG t,tt; |
| 796 | #else | 796 | #elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
| 797 | BN_ULONG bl,bh; | 797 | BN_ULONG bl,bh; |
| 798 | #endif | 798 | #endif |
| 799 | BN_ULONG t1,t2; | 799 | BN_ULONG t1,t2; |