diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-06-09 09:46:12 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-06-09 09:46:12 -0700 |
| commit | 1ec10e342d711b1d3fb3310280c378513108df13 (patch) | |
| tree | 567eee4f42d32c949bec4b7d19299b536b06be37 | |
| parent | 4e456f06d1b87ab215d826d420c219f1200613e6 (diff) | |
| download | cryptography-1ec10e342d711b1d3fb3310280c378513108df13.tar.gz cryptography-1ec10e342d711b1d3fb3310280c378513108df13.tar.bz2 cryptography-1ec10e342d711b1d3fb3310280c378513108df13.zip | |
Fixed up a few issues
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/conf.py | 2 |
3 files changed, 1 insertions, 4 deletions
@@ -11,4 +11,3 @@ cryptography/_Cryptography_cffi_* *.egg-info/ *.egg *.py[co] -.idea/
\ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 17f8b05d..a38534d4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,6 @@ Changelog .. note:: This version is not yet released and is under active development. -* Added OPENSSL_config and OPENSSL_no_conf declarations - for the openssl binding. * Added :class:`~cryptography.hazmat.primitives.kdf.hkdf.HKDFExpand`. * Added :class:`~cryptography.hazmat.primitives.ciphers.modes.CFB8` support for :class:`~cryptography.hazmat.primitives.ciphers.algorithms.AES` and diff --git a/cryptography/hazmat/bindings/openssl/conf.py b/cryptography/hazmat/bindings/openssl/conf.py index e4957712..001a0707 100644 --- a/cryptography/hazmat/bindings/openssl/conf.py +++ b/cryptography/hazmat/bindings/openssl/conf.py @@ -22,7 +22,7 @@ typedef ... CONF; """ FUNCTIONS = """ -void OPENSSL_config(const char*); +void OPENSSL_config(const char *); void OPENSSL_no_config(void); """ |