diff options
| -rw-r--r-- | cryptography/hazmat/backends/openssl/opensslv.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/x509.py | 2 | ||||
| -rw-r--r-- | docs/contributing.rst | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cryptography/hazmat/backends/openssl/opensslv.py b/cryptography/hazmat/backends/openssl/opensslv.py index 4e110327..397f4ca2 100644 --- a/cryptography/hazmat/backends/openssl/opensslv.py +++ b/cryptography/hazmat/backends/openssl/opensslv.py @@ -17,7 +17,7 @@ INCLUDES = """ TYPES = """ static const int OPENSSL_VERSION_NUMBER; -static char *const OPENSSL_VERSION_TEXT; +static const char *const OPENSSL_VERSION_TEXT; """ FUNCTIONS = """ diff --git a/cryptography/hazmat/backends/openssl/x509.py b/cryptography/hazmat/backends/openssl/x509.py index c83f5685..f0061a70 100644 --- a/cryptography/hazmat/backends/openssl/x509.py +++ b/cryptography/hazmat/backends/openssl/x509.py @@ -185,7 +185,7 @@ X509_EXTENSIONS *sk_X509_EXTENSION_new_null(void); int sk_X509_EXTENSION_num(X509_EXTENSIONS *); X509_EXTENSION *sk_X509_EXTENSION_value(X509_EXTENSIONS *, int); int sk_X509_EXTENSION_push(X509_EXTENSIONS *, X509_EXTENSION *); -void sk_X509_EXTENSION_delete(X509_EXTENSIONS *, int); +X509_EXTENSION *sk_X509_EXTENSION_delete(X509_EXTENSIONS *, int); void sk_X509_EXTENSION_free(X509_EXTENSIONS *); int sk_X509_REVOKED_num(struct stack_st_X509_REVOKED *); diff --git a/docs/contributing.rst b/docs/contributing.rst index 63c99530..657c4359 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -141,17 +141,17 @@ this: .. code-block:: c - #define SOME_INTEGER 0x0; - #define SOME_UINTEGER (unsigned int)0x0001; - #define SOME_STRING "hello"; + #define SOME_INTEGER_LITERAL 0x0; + #define SOME_UNSIGNED_INTEGER_LITERAL 0x0001U; + #define SOME_STRING_LITERAL "hello"; ...it should be added to the bindings like so: .. code-block:: c - static const int SOME_INTEGER; - static const unsigned int SOME_UINTEGER; - static char *const SOME_STRING; + static const int SOME_INTEGER_LITERAL; + static const unsigned int SOME_UNSIGNED_INTEGER_LITERAL; + static const char *const SOME_STRING_LITERAL; Documentation ------------- |