pyca/bcrypt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from dstufft/fix-missing-asm-i386

Browse Source 
Don't attempt to load assembler on i386
This commit is contained in:
Donald Stufft 2013-05-19 07:12:27 -07:00
commit 1b0c6815d4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bcrypt/__init__.py
View File

@ -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)],

2
bcrypt/crypt_blowfish-1.2/crypt_blowfish.c
View File

@ -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