summaryrefslogtreecommitdiff
path: root/crypto/srp
diff options
context:
space:
mode:
authorappro <appro>2011-05-29 13:51:14 +0000
committerappro <appro>2011-05-29 13:51:14 +0000
commitdd5d4140d1a2545b4c2710c806b909255a292834 (patch)
treef22239a552907200227cd2149c6c7054fad7503c /crypto/srp
parent777f17b140b6078e17a5da5c6bb827110412b4cb (diff)
downloadopenssl-dd5d4140d1a2545b4c2710c806b909255a292834.tar.gz
Various mingw64 fixes.
Diffstat (limited to 'crypto/srp')
-rw-r--r--crypto/srp/srp_lib.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index 9f6318281..8eacf0453 100644
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -63,13 +63,17 @@
#include <openssl/evp.h>
#if (BN_BYTES == 8)
-#define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##ul
-#endif
-#if (BN_BYTES == 4)
-#define bn_pack4(a1,a2,a3,a4) 0x##a3##a4##ul, 0x##a1##a2##ul
-#endif
-#if (BN_BYTES == 2)
-#define bn_pack4(a1,a2,a3,a4) 0x##a4##u,0x##a3##u,0x##a2##u,0x##a1##u
+# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+# define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##UI64
+# elif defined(__arch64__)
+# define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##UL
+# else
+# define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##ULL
+# endif
+#elif (BN_BYTES == 4)
+# define bn_pack4(a1,a2,a3,a4) 0x##a3##a4##UL, 0x##a1##a2##UL
+#else
+# error "unsupported BN_BYTES"
#endif