From 332936dffb7c8574be7340271f9cfb196f25a016 Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 26 Jun 2015 21:59:15 -0700 Subject: deopaque a couple of things --- src/_cffi_src/openssl/engine.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/_cffi_src/openssl/engine.py') diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index 3ebfa6c1..bc5c1906 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -11,15 +11,24 @@ INCLUDES = """ TYPES = """ static const long Cryptography_HAS_ENGINE_CRYPTODEV; +struct rand_meth_st { + void (*seed)(const void *buf, int num); + int (*bytes)(unsigned char *buf, int num); + void (*cleanup)(void); + void (*add)(const void *buf, int num, double entropy); + int (*pseudorand)(unsigned char *buf, int num); + int (*status)(void); +}; + typedef ... ENGINE; typedef ... RSA_METHOD; typedef ... DSA_METHOD; typedef ... ECDH_METHOD; typedef ... ECDSA_METHOD; typedef ... DH_METHOD; -typedef ... RAND_METHOD; +typedef struct rand_meth_st RAND_METHOD; typedef ... STORE_METHOD; -typedef ... *ENGINE_GEN_INT_FUNC_PTR; +typedef int(*ENGINE_GEN_INT_FUNC_PTR)(ENGINE*); typedef ... *ENGINE_CTRL_FUNC_PTR; typedef ... *ENGINE_LOAD_KEY_PTR; typedef ... *ENGINE_CIPHERS_PTR; -- cgit v1.2.3 From add79c02c102f2874974bdec727c9733a48685cc Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 26 Jun 2015 23:17:06 -0700 Subject: comply with C coding standard, for which there is no linter --- src/_cffi_src/openssl/engine.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/_cffi_src/openssl/engine.py') diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index bc5c1906..821c9235 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -12,12 +12,12 @@ TYPES = """ static const long Cryptography_HAS_ENGINE_CRYPTODEV; struct rand_meth_st { - void (*seed)(const void *buf, int num); - int (*bytes)(unsigned char *buf, int num); - void (*cleanup)(void); - void (*add)(const void *buf, int num, double entropy); - int (*pseudorand)(unsigned char *buf, int num); - int (*status)(void); + void (*seed)(const void *, int); + int (*bytes)(unsigned char *, int); + void (*cleanup)(); + void (*add)(const void *, int, double); + int (*pseudorand)(unsigned char *, int); + int (*status)(); }; typedef ... ENGINE; @@ -28,7 +28,7 @@ typedef ... ECDSA_METHOD; typedef ... DH_METHOD; typedef struct rand_meth_st RAND_METHOD; typedef ... STORE_METHOD; -typedef int(*ENGINE_GEN_INT_FUNC_PTR)(ENGINE*); +typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *); typedef ... *ENGINE_CTRL_FUNC_PTR; typedef ... *ENGINE_LOAD_KEY_PTR; typedef ... *ENGINE_CIPHERS_PTR; -- cgit v1.2.3 From 28e7d80faff025e2fa90ea69813fc73332387c25 Mon Sep 17 00:00:00 2001 From: Glyph Date: Sat, 27 Jun 2015 15:13:12 -0700 Subject: don't need the intermediary 'struct' declaration. --- src/_cffi_src/openssl/engine.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/_cffi_src/openssl/engine.py') diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index 821c9235..5079fd69 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -11,22 +11,20 @@ INCLUDES = """ TYPES = """ static const long Cryptography_HAS_ENGINE_CRYPTODEV; -struct rand_meth_st { - void (*seed)(const void *, int); - int (*bytes)(unsigned char *, int); - void (*cleanup)(); - void (*add)(const void *, int, double); - int (*pseudorand)(unsigned char *, int); - int (*status)(); -}; - typedef ... ENGINE; typedef ... RSA_METHOD; typedef ... DSA_METHOD; typedef ... ECDH_METHOD; typedef ... ECDSA_METHOD; typedef ... DH_METHOD; -typedef struct rand_meth_st RAND_METHOD; +typedef struct { + void (*seed)(const void *, int); + int (*bytes)(unsigned char *, int); + void (*cleanup)(); + void (*add)(const void *, int, double); + int (*pseudorand)(unsigned char *, int); + int (*status)(); +} RAND_METHOD; typedef ... STORE_METHOD; typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *); typedef ... *ENGINE_CTRL_FUNC_PTR; -- cgit v1.2.3