diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 18:58:20 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 18:58:20 -0600 |
| commit | 09fd41dd385797faa967601a95d79e1d4e126e0d (patch) | |
| tree | 242ef14088c389736e14dd44a200f4037a7b54df | |
| parent | 6f93357f3826e321cd300c661da3e1fa2e44478b (diff) | |
| parent | 0f63388d7298981045a18304c94029a5eee873df (diff) | |
| download | cryptography-09fd41dd385797faa967601a95d79e1d4e126e0d.tar.gz cryptography-09fd41dd385797faa967601a95d79e1d4e126e0d.tar.bz2 cryptography-09fd41dd385797faa967601a95d79e1d4e126e0d.zip | |
Merge pull request #567 from alex/filename-match
Make the filename match
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/osrandom_engine.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cryptography/hazmat/bindings/openssl/osrandom_engine.py b/cryptography/hazmat/bindings/openssl/osrandom_engine.py index 6e7e172e..23f2e17a 100644 --- a/cryptography/hazmat/bindings/openssl/osrandom_engine.py +++ b/cryptography/hazmat/bindings/openssl/osrandom_engine.py @@ -53,7 +53,9 @@ static int osrandom_rand_bytes(unsigned char *buffer, int size) { } if (!CryptGenRandom(hCryptProv, (DWORD)size, buffer)) { - ERR_put_error(ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom.py", 0); + ERR_put_error( + ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom_engine.py", 0 + ); return 0; } return 1; @@ -109,7 +111,9 @@ static int osrandom_rand_bytes(unsigned char *buffer, int size) { n = read(urandom_fd, buffer, (size_t)size); } while (n < 0 && errno == EINTR); if (n <= 0) { - ERR_put_error(ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom.py", 0); + ERR_put_error( + ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom_engine.py", 0 + ); return 0; } buffer += n; @@ -145,9 +149,9 @@ static const char *Cryptography_osrandom_engine_id = "osrandom"; static const char *Cryptography_osrandom_engine_name = "osrandom_engine"; #if defined(_WIN32) -""" + WIN32_CUSTOMIZATIONS + """ +%(WIN32_CUSTOMIZATIONS)s #else -""" + POSIX_CUSTOMIZATIONS + """ +%(POSIX_CUSTOMIZATIONS)s #endif /* This replicates the behavior of the OpenSSL FIPS RNG, which returns a @@ -193,6 +197,9 @@ int Cryptography_add_osrandom_engine(void) { return 1; } -""" +""" % { + "WIN32_CUSTOMIZATIONS": WIN32_CUSTOMIZATIONS, + "POSIX_CUSTOMIZATIONS": POSIX_CUSTOMIZATIONS, +} CONDITIONAL_NAMES = {} |