diff options
| author | Donald Stufft <donald@stufft.io> | 2013-05-19 07:12:27 -0700 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2013-05-19 07:12:27 -0700 |
| commit | 1b0c6815d4d63f4737398de10f52d9d5e13b7db7 (patch) | |
| tree | dfa8feb6f92f0b413ba114f072597446cc157919 | |
| parent | 616a8decfd3cf6c653abbe51d936fe406da5ebfe (diff) | |
| parent | c4b252b53f941028bda0261c56e942a9fe566b9f (diff) | |
| download | py-bcrypt-git-1b0c6815d4d63f4737398de10f52d9d5e13b7db7.tar.gz | |
Merge pull request #4 from dstufft/fix-missing-asm-i386
Don't attempt to load assembler on i386
| -rw-r--r-- | bcrypt/__init__.py | 2 | ||||
| -rw-r--r-- | bcrypt/crypt_blowfish-1.2/crypt_blowfish.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bcrypt/__init__.py b/bcrypt/__init__.py index 4d45559..2f41e33 100644 --- a/bcrypt/__init__.py +++ b/bcrypt/__init__.py @@ -56,6 +56,8 @@ _bcrypt_lib = _ffi.verify('#include "ow-crypt.h"', str(os.path.join(_bundled_dir, "crypt_gensalt.c")), str(os.path.join(_bundled_dir, "wrapper.c")), # How can we get distutils to work with a .S file? + # Set https://github.com/dstufft/bcrypt/blob/4c939e895bd9607301cda6d6f05ef3c1146eb658/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c#L57 + # back to 1 if we get ASM loaded. # str(os.path.join(_bundled_dir, "x86.S")), ], include_dirs=[str(_bundled_dir)], diff --git a/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c b/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c index df00bd9..ec9a188 100644 --- a/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c +++ b/bcrypt/crypt_blowfish-1.2/crypt_blowfish.c @@ -54,7 +54,7 @@ #include "crypt_blowfish.h" #ifdef __i386__ -#define BF_ASM 1 +#define BF_ASM 0 #define BF_SCALE 1 #elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) #define BF_ASM 0 |