diff options
| author | miod <> | 2014-04-13 15:16:38 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-13 15:16:38 +0000 |
| commit | 5b71a8afd23ce608505ed5ff6edccaeb02dc03b7 (patch) | |
| tree | 5120067244554214f4a55a9b6f4ab44bca0a0438 /src/lib/libcrypto/srp/srp_lib.c | |
| parent | 9603cdb2b7d2fd489ebceaf2e6fb83ed8a059b1a (diff) | |
| download | openbsd-5b71a8afd23ce608505ed5ff6edccaeb02dc03b7.tar.gz openbsd-5b71a8afd23ce608505ed5ff6edccaeb02dc03b7.tar.bz2 openbsd-5b71a8afd23ce608505ed5ff6edccaeb02dc03b7.zip | |
Import OpenSSL 1.0.1g
Diffstat (limited to 'src/lib/libcrypto/srp/srp_lib.c')
| -rw-r--r-- | src/lib/libcrypto/srp/srp_lib.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/lib/libcrypto/srp/srp_lib.c b/src/lib/libcrypto/srp/srp_lib.c index 92cea98dcd..7c1dcc5111 100644 --- a/src/lib/libcrypto/srp/srp_lib.c +++ b/src/lib/libcrypto/srp/srp_lib.c | |||
| @@ -63,13 +63,17 @@ | |||
| 63 | #include <openssl/evp.h> | 63 | #include <openssl/evp.h> |
| 64 | 64 | ||
| 65 | #if (BN_BYTES == 8) | 65 | #if (BN_BYTES == 8) |
| 66 | #define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##ul | 66 | # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) |
| 67 | #endif | 67 | # define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64) |
| 68 | #if (BN_BYTES == 4) | 68 | # elif defined(__arch64__) |
| 69 | #define bn_pack4(a1,a2,a3,a4) 0x##a3##a4##ul, 0x##a1##a2##ul | 69 | # define bn_pack4(a1,a2,a3,a4) ((a1##UL<<48)|(a2##UL<<32)|(a3##UL<<16)|a4##UL) |
| 70 | #endif | 70 | # else |
| 71 | #if (BN_BYTES == 2) | 71 | # define bn_pack4(a1,a2,a3,a4) ((a1##ULL<<48)|(a2##ULL<<32)|(a3##ULL<<16)|a4##ULL) |
| 72 | #define bn_pack4(a1,a2,a3,a4) 0x##a4##u,0x##a3##u,0x##a2##u,0x##a1##u | 72 | # endif |
| 73 | #elif (BN_BYTES == 4) | ||
| 74 | # define bn_pack4(a1,a2,a3,a4) ((a3##UL<<16)|a4##UL), ((a1##UL<<16)|a2##UL) | ||
| 75 | #else | ||
| 76 | # error "unsupported BN_BYTES" | ||
| 73 | #endif | 77 | #endif |
| 74 | 78 | ||
| 75 | 79 | ||