From 1ec10e342d711b1d3fb3310280c378513108df13 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 9 Jun 2014 09:46:12 -0700 Subject: Fixed up a few issues --- .gitignore | 1 - CHANGELOG.rst | 2 -- cryptography/hazmat/bindings/openssl/conf.py | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 46bc9c45..8eec5dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -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); """ -- cgit v1.2.3