From 491fd7cc5aefff8064039d073331b41a2f606a63 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Tue, 27 Jun 2017 11:15:37 -1000
Subject: Funcs macros gone (#3695)

* No more FUNCS/MACROS distinction

* change the docs to not talk about MACROS since they're gone

* remove out of date comment
---
 src/_cffi_src/openssl/aes.py             | 3 ---
 src/_cffi_src/openssl/asn1.py            | 3 ---
 src/_cffi_src/openssl/bignum.py          | 2 --
 src/_cffi_src/openssl/bio.py             | 3 ---
 src/_cffi_src/openssl/callbacks.py       | 3 ---
 src/_cffi_src/openssl/cmac.py            | 3 ---
 src/_cffi_src/openssl/cms.py             | 3 ---
 src/_cffi_src/openssl/conf.py            | 3 ---
 src/_cffi_src/openssl/crypto.py          | 3 ---
 src/_cffi_src/openssl/cryptography.py    | 3 ---
 src/_cffi_src/openssl/ct.py              | 3 ---
 src/_cffi_src/openssl/dh.py              | 3 ---
 src/_cffi_src/openssl/dsa.py             | 3 ---
 src/_cffi_src/openssl/ec.py              | 3 ---
 src/_cffi_src/openssl/ecdh.py            | 3 ---
 src/_cffi_src/openssl/ecdsa.py           | 3 ---
 src/_cffi_src/openssl/engine.py          | 3 ---
 src/_cffi_src/openssl/err.py             | 3 ---
 src/_cffi_src/openssl/evp.py             | 3 ---
 src/_cffi_src/openssl/hmac.py            | 3 ---
 src/_cffi_src/openssl/nid.py             | 3 ---
 src/_cffi_src/openssl/objects.py         | 3 ---
 src/_cffi_src/openssl/ocsp.py            | 3 ---
 src/_cffi_src/openssl/opensslv.py        | 3 ---
 src/_cffi_src/openssl/osrandom_engine.py | 3 ---
 src/_cffi_src/openssl/pem.py             | 3 ---
 src/_cffi_src/openssl/pkcs12.py          | 3 ---
 src/_cffi_src/openssl/pkcs7.py           | 3 ---
 src/_cffi_src/openssl/rand.py            | 3 ---
 src/_cffi_src/openssl/rsa.py             | 3 ---
 src/_cffi_src/openssl/ssl.py             | 3 ---
 src/_cffi_src/openssl/x509.py            | 3 ---
 src/_cffi_src/openssl/x509_vfy.py        | 3 ---
 src/_cffi_src/openssl/x509name.py        | 3 ---
 src/_cffi_src/openssl/x509v3.py          | 3 ---
 35 files changed, 104 deletions(-)

(limited to 'src/_cffi_src/openssl')

diff --git a/src/_cffi_src/openssl/aes.py b/src/_cffi_src/openssl/aes.py
index d035fa8e..028c92ce 100644
--- a/src/_cffi_src/openssl/aes.py
+++ b/src/_cffi_src/openssl/aes.py
@@ -27,9 +27,6 @@ int AES_unwrap_key(AES_KEY *, const unsigned char *, unsigned char *,
                    const unsigned char *, unsigned int);
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 static const long Cryptography_HAS_AES_WRAP = 1;
 """
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py
index 8644d059..ce2d0782 100644
--- a/src/_cffi_src/openssl/asn1.py
+++ b/src/_cffi_src/openssl/asn1.py
@@ -101,9 +101,6 @@ int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *, unsigned char **);
 ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **, const unsigned char **, long,
                           const ASN1_ITEM *);
 int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *, int, int);
-"""
-
-MACROS = """
 /* These became const ASN1_* in 1.1.0 */
 int i2d_ASN1_OBJECT(ASN1_OBJECT *, unsigned char **);
 int ASN1_STRING_type(ASN1_STRING *);
diff --git a/src/_cffi_src/openssl/bignum.py b/src/_cffi_src/openssl/bignum.py
index 455afdc1..fb33c459 100644
--- a/src/_cffi_src/openssl/bignum.py
+++ b/src/_cffi_src/openssl/bignum.py
@@ -68,9 +68,7 @@ int BN_clear_bit(BIGNUM *, int);
 int BN_is_bit_set(const BIGNUM *, int);
 
 int BN_mask_bits(BIGNUM *, int);
-"""
 
-MACROS = """
 int BN_num_bytes(const BIGNUM *);
 
 int BN_zero(BIGNUM *);
diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
index 19569704..2d9659e1 100644
--- a/src/_cffi_src/openssl/bio.py
+++ b/src/_cffi_src/openssl/bio.py
@@ -82,9 +82,6 @@ int BIO_gets(BIO *, char *, int);
 int BIO_write(BIO *, const void *, int);
 int BIO_puts(BIO *, const char *);
 int BIO_method_type(const BIO *);
-"""
-
-MACROS = """
 /* Added in 1.1.0 */
 int BIO_up_ref(BIO *);
 
diff --git a/src/_cffi_src/openssl/callbacks.py b/src/_cffi_src/openssl/callbacks.py
index 5895e7b0..cf2b2da5 100644
--- a/src/_cffi_src/openssl/callbacks.py
+++ b/src/_cffi_src/openssl/callbacks.py
@@ -34,9 +34,6 @@ int _setup_ssl_threads(void);
 int Cryptography_pem_password_cb(char *, int, int, void *);
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 /* This code is derived from the locking code found in the Python _ssl module's
    locking callback for OpenSSL.
diff --git a/src/_cffi_src/openssl/cmac.py b/src/_cffi_src/openssl/cmac.py
index 85b685d9..f976647f 100644
--- a/src/_cffi_src/openssl/cmac.py
+++ b/src/_cffi_src/openssl/cmac.py
@@ -16,9 +16,6 @@ typedef ... CMAC_CTX;
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 CMAC_CTX *CMAC_CTX_new(void);
 int CMAC_Init(CMAC_CTX *, const void *, size_t, const EVP_CIPHER *, ENGINE *);
 int CMAC_Update(CMAC_CTX *, const void *, size_t);
diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py
index fb87bd37..a5493d68 100644
--- a/src/_cffi_src/openssl/cms.py
+++ b/src/_cffi_src/openssl/cms.py
@@ -45,9 +45,6 @@ static const int CMS_DEBUG_DECRYPT;
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 BIO *BIO_new_CMS(BIO *, CMS_ContentInfo *);
 int i2d_CMS_bio_stream(BIO *, CMS_ContentInfo *, BIO *, int);
 int PEM_write_bio_CMS_stream(BIO *, CMS_ContentInfo *, BIO *, int);
diff --git a/src/_cffi_src/openssl/conf.py b/src/_cffi_src/openssl/conf.py
index ad21476a..9db0162a 100644
--- a/src/_cffi_src/openssl/conf.py
+++ b/src/_cffi_src/openssl/conf.py
@@ -13,9 +13,6 @@ TYPES = """
 
 FUNCTIONS = """
 void OPENSSL_config(const char *);
-"""
-
-MACROS = """
 /* This is a macro in 1.1.0 */
 void OPENSSL_no_config(void);
 """
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py
index 64c0aa4d..dfff21bb 100644
--- a/src/_cffi_src/openssl/crypto.py
+++ b/src/_cffi_src/openssl/crypto.py
@@ -34,9 +34,6 @@ static const int CRYPTO_LOCK_SSL;
 
 FUNCTIONS = """
 int CRYPTO_mem_ctrl(int);
-"""
-
-MACROS = """
 /* CRYPTO_cleanup_all_ex_data became a macro in 1.1.0 */
 void CRYPTO_cleanup_all_ex_data(void);
 
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
index fe5055f1..1cacc8f5 100644
--- a/src/_cffi_src/openssl/cryptography.py
+++ b/src/_cffi_src/openssl/cryptography.py
@@ -64,8 +64,5 @@ static const int CRYPTOGRAPHY_IS_LIBRESSL;
 FUNCTIONS = """
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 """
diff --git a/src/_cffi_src/openssl/ct.py b/src/_cffi_src/openssl/ct.py
index e7550bc6..21018d7e 100644
--- a/src/_cffi_src/openssl/ct.py
+++ b/src/_cffi_src/openssl/ct.py
@@ -38,9 +38,6 @@ typedef ... Cryptography_STACK_OF_SCT;
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 sct_version_t SCT_get_version(const SCT *);
 
 ct_log_entry_type_t SCT_get_log_entry_type(const SCT *);
diff --git a/src/_cffi_src/openssl/dh.py b/src/_cffi_src/openssl/dh.py
index 42309e40..be761b97 100644
--- a/src/_cffi_src/openssl/dh.py
+++ b/src/_cffi_src/openssl/dh.py
@@ -35,9 +35,6 @@ void DH_get0_key(const DH *, const BIGNUM **, const BIGNUM **);
 int DH_set0_key(DH *, BIGNUM *, BIGNUM *);
 
 int Cryptography_DH_check(const DH *, int *);
-"""
-
-MACROS = """
 int DH_generate_parameters_ex(DH *, int, int, BN_GENCB *);
 DH *d2i_DHparams_bio(BIO *, DH **);
 int i2d_DHparams_bio(BIO *, DH *);
diff --git a/src/_cffi_src/openssl/dsa.py b/src/_cffi_src/openssl/dsa.py
index 05282c0e..d61b692e 100644
--- a/src/_cffi_src/openssl/dsa.py
+++ b/src/_cffi_src/openssl/dsa.py
@@ -29,9 +29,6 @@ void DSA_get0_pqg(const DSA *, const BIGNUM **, const BIGNUM **,
 int DSA_set0_pqg(DSA *, BIGNUM *, BIGNUM *, BIGNUM *);
 void DSA_get0_key(const DSA *, const BIGNUM **, const BIGNUM **);
 int DSA_set0_key(DSA *, BIGNUM *, BIGNUM *);
-"""
-
-MACROS = """
 int DSA_generate_parameters_ex(DSA *, int, unsigned char *, int,
                                int *, unsigned long *, BN_GENCB *);
 """
diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py
index c9598b56..d3d02307 100644
--- a/src/_cffi_src/openssl/ec.py
+++ b/src/_cffi_src/openssl/ec.py
@@ -33,9 +33,6 @@ typedef enum {
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 EC_GROUP *EC_GROUP_new(const EC_METHOD *);
 void EC_GROUP_free(EC_GROUP *);
 void EC_GROUP_clear_free(EC_GROUP *);
diff --git a/src/_cffi_src/openssl/ecdh.py b/src/_cffi_src/openssl/ecdh.py
index 7f658808..043635c4 100644
--- a/src/_cffi_src/openssl/ecdh.py
+++ b/src/_cffi_src/openssl/ecdh.py
@@ -14,9 +14,6 @@ static const int Cryptography_HAS_SET_ECDH_AUTO;
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 int ECDH_compute_key(void *, size_t, const EC_POINT *, EC_KEY *,
                      void *(*)(const void *, size_t, void *, size_t *));
 long SSL_CTX_set_ecdh_auto(SSL_CTX *, int);
diff --git a/src/_cffi_src/openssl/ecdsa.py b/src/_cffi_src/openssl/ecdsa.py
index 2022b814..78501337 100644
--- a/src/_cffi_src/openssl/ecdsa.py
+++ b/src/_cffi_src/openssl/ecdsa.py
@@ -19,9 +19,6 @@ typedef ... CRYPTO_EX_free;
 """
 
 FUNCTIONS = """
-"""
-
-MACROS = """
 ECDSA_SIG *ECDSA_SIG_new();
 void ECDSA_SIG_free(ECDSA_SIG *);
 int i2d_ECDSA_SIG(const ECDSA_SIG *, unsigned char **);
diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py
index 02216f4e..bed39d06 100644
--- a/src/_cffi_src/openssl/engine.py
+++ b/src/_cffi_src/openssl/engine.py
@@ -125,9 +125,6 @@ const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *);
 EVP_PKEY *ENGINE_load_private_key(ENGINE *, const char *, UI_METHOD *, void *);
 EVP_PKEY *ENGINE_load_public_key(ENGINE *, const char *, UI_METHOD *, void *);
 void ENGINE_add_conf_module(void);
-"""
-
-MACROS = """
 /* these became macros in 1.1.0 */
 void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
diff --git a/src/_cffi_src/openssl/err.py b/src/_cffi_src/openssl/err.py
index 8554ef40..55f2470f 100644
--- a/src/_cffi_src/openssl/err.py
+++ b/src/_cffi_src/openssl/err.py
@@ -255,9 +255,6 @@ void ERR_put_error(int, int, int, const char *, int);
 void ERR_add_error_data(int, ...);
 int ERR_get_next_error_library(void);
 ERR_STATE *ERR_get_state(void);
-"""
-
-MACROS = """
 /* ERR_free_strings became a macro in 1.1.0 */
 void ERR_free_strings(void);
 
diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py
index a4edfc5a..3fcac0c2 100644
--- a/src/_cffi_src/openssl/evp.py
+++ b/src/_cffi_src/openssl/evp.py
@@ -146,9 +146,6 @@ int Cryptography_EVP_PKEY_id(const EVP_PKEY *);
    without worrying about what OpenSSL we're running against. */
 EVP_MD_CTX *Cryptography_EVP_MD_CTX_new(void);
 void Cryptography_EVP_MD_CTX_free(EVP_MD_CTX *);
-"""
-
-MACROS = """
 /* Added in 1.1.0 */
 size_t EVP_PKEY_get1_tls_encodedpoint(EVP_PKEY *, unsigned char **);
 int EVP_PKEY_set1_tls_encodedpoint(EVP_PKEY *, const unsigned char *,
diff --git a/src/_cffi_src/openssl/hmac.py b/src/_cffi_src/openssl/hmac.py
index f15f4dd3..b006e642 100644
--- a/src/_cffi_src/openssl/hmac.py
+++ b/src/_cffi_src/openssl/hmac.py
@@ -22,9 +22,6 @@ HMAC_CTX *Cryptography_HMAC_CTX_new(void);
 void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx);
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 HMAC_CTX *Cryptography_HMAC_CTX_new(void) {
 #if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
diff --git a/src/_cffi_src/openssl/nid.py b/src/_cffi_src/openssl/nid.py
index 2cc4c2ae..ee739c1b 100644
--- a/src/_cffi_src/openssl/nid.py
+++ b/src/_cffi_src/openssl/nid.py
@@ -226,9 +226,6 @@ static const int NID_ad_ca_issuers;
 FUNCTIONS = """
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 #ifndef NID_X25519
 static const long Cryptography_HAS_X25519 = 0;
diff --git a/src/_cffi_src/openssl/objects.py b/src/_cffi_src/openssl/objects.py
index 19ff4c17..265ac75c 100644
--- a/src/_cffi_src/openssl/objects.py
+++ b/src/_cffi_src/openssl/objects.py
@@ -33,9 +33,6 @@ int OBJ_cmp(const ASN1_OBJECT *, const ASN1_OBJECT *);
 ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *);
 int OBJ_create(const char *, const char *, const char *);
 void OBJ_NAME_do_all(int, void (*) (const OBJ_NAME *, void *), void *);
-"""
-
-MACROS = """
 /* OBJ_cleanup became a macro in 1.1.0 */
 void OBJ_cleanup(void);
 """
diff --git a/src/_cffi_src/openssl/ocsp.py b/src/_cffi_src/openssl/ocsp.py
index 5865dba1..ea3e5ad1 100644
--- a/src/_cffi_src/openssl/ocsp.py
+++ b/src/_cffi_src/openssl/ocsp.py
@@ -54,9 +54,6 @@ OCSP_REQUEST *OCSP_REQUEST_new(void);
 void OCSP_REQUEST_free(OCSP_REQUEST *);
 int OCSP_request_add1_nonce(OCSP_REQUEST *, unsigned char *, int);
 int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *, int, void *, int, unsigned long);
-"""
-
-MACROS = """
 OCSP_REQUEST *d2i_OCSP_REQUEST_bio(BIO *, OCSP_REQUEST **);
 OCSP_RESPONSE *d2i_OCSP_RESPONSE_bio(BIO *, OCSP_RESPONSE **);
 int i2d_OCSP_REQUEST_bio(BIO *, OCSP_REQUEST *);
diff --git a/src/_cffi_src/openssl/opensslv.py b/src/_cffi_src/openssl/opensslv.py
index a4e88f07..9b0c6893 100644
--- a/src/_cffi_src/openssl/opensslv.py
+++ b/src/_cffi_src/openssl/opensslv.py
@@ -18,8 +18,5 @@ static const char *const OPENSSL_VERSION_TEXT;
 FUNCTIONS = """
 """
 
-MACROS = """
-"""
-
 CUSTOMIZATIONS = """
 """
diff --git a/src/_cffi_src/openssl/osrandom_engine.py b/src/_cffi_src/openssl/osrandom_engine.py
index 93af8cf7..ed1068ef 100644
--- a/src/_cffi_src/openssl/osrandom_engine.py
+++ b/src/_cffi_src/openssl/osrandom_engine.py
@@ -20,8 +20,5 @@ FUNCTIONS = """
 int Cryptography_add_osrandom_engine(void);
 """
 
-MACROS = """
-"""
-
 with open(os.path.join(HERE, "src/osrandom_engine.c")) as f:
     CUSTOMIZATIONS = f.read()
diff --git a/src/_cffi_src/openssl/pem.py b/src/_cffi_src/openssl/pem.py
index 5c1bc180..55519bb1 100644
--- a/src/_cffi_src/openssl/pem.py
+++ b/src/_cffi_src/openssl/pem.py
@@ -75,9 +75,6 @@ int PEM_write_bio_RSAPublicKey(BIO *, const RSA *);
 
 EVP_PKEY *PEM_read_bio_PUBKEY(BIO *, EVP_PKEY **, pem_password_cb *, void *);
 int PEM_write_bio_PUBKEY(BIO *, EVP_PKEY *);
-"""
-
-MACROS = """
 int PEM_write_bio_ECPrivateKey(BIO *, EC_KEY *, const EVP_CIPHER *,
                                unsigned char *, int, pem_password_cb *,
                                void *);
diff --git a/src/_cffi_src/openssl/pkcs12.py b/src/_cffi_src/openssl/pkcs12.py
index 0bbd1e53..21a8481f 100644
--- a/src/_cffi_src/openssl/pkcs12.py
+++ b/src/_cffi_src/openssl/pkcs12.py
@@ -17,9 +17,6 @@ void PKCS12_free(PKCS12 *);
 
 PKCS12 *d2i_PKCS12_bio(BIO *, PKCS12 **);
 int i2d_PKCS12_bio(BIO *, PKCS12 *);
-"""
-
-MACROS = """
 int PKCS12_parse(PKCS12 *, const char *, EVP_PKEY **, X509 **,
                  Cryptography_STACK_OF_X509 **);
 PKCS12 *PKCS12_create(char *, char *, EVP_PKEY *, X509 *,
diff --git a/src/_cffi_src/openssl/pkcs7.py b/src/_cffi_src/openssl/pkcs7.py
index 0dd89582..1bece5b7 100644
--- a/src/_cffi_src/openssl/pkcs7.py
+++ b/src/_cffi_src/openssl/pkcs7.py
@@ -72,9 +72,6 @@ PKCS7 *PKCS7_encrypt(Cryptography_STACK_OF_X509 *, BIO *,
 int PKCS7_decrypt(PKCS7 *, EVP_PKEY *, X509 *, BIO *, int);
 
 BIO *PKCS7_dataInit(PKCS7 *, BIO *);
-"""
-
-MACROS = """
 int PKCS7_type_is_encrypted(PKCS7 *);
 int PKCS7_type_is_signed(PKCS7 *);
 int PKCS7_type_is_enveloped(PKCS7 *);
diff --git a/src/_cffi_src/openssl/rand.py b/src/_cffi_src/openssl/rand.py
index a294e961..ed4c6c3c 100644
--- a/src/_cffi_src/openssl/rand.py
+++ b/src/_cffi_src/openssl/rand.py
@@ -20,9 +20,6 @@ const char *RAND_file_name(char *, size_t);
 int RAND_load_file(const char *, long);
 int RAND_write_file(const char *);
 int RAND_bytes(unsigned char *, int);
-"""
-
-MACROS = """
 /* ERR_load_RAND_strings started returning an int in 1.1.0. Unfortunately we
    can't declare a conditional signature like that. Since it always returns
    1 we'll just lie about the signature to preserve compatibility for
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py
index ed826ec6..eddde84c 100644
--- a/src/_cffi_src/openssl/rsa.py
+++ b/src/_cffi_src/openssl/rsa.py
@@ -59,9 +59,6 @@ void RSA_get0_key(const RSA *, const BIGNUM **, const BIGNUM **,
 void RSA_get0_factors(const RSA *, const BIGNUM **, const BIGNUM **);
 void RSA_get0_crt_params(const RSA *, const BIGNUM **, const BIGNUM **,
                          const BIGNUM **);
-"""
-
-MACROS = """
 int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *, int);
 int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *, int);
 int EVP_PKEY_CTX_set_rsa_mgf1_md(EVP_PKEY_CTX *, EVP_MD *);
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 116a54d4..8fef9460 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -245,9 +245,6 @@ size_t SSL_get_peer_finished(const SSL *, void *, size_t);
 Cryptography_STACK_OF_X509_NAME *SSL_load_client_CA_file(const char *);
 
 const char *SSL_get_servername(const SSL *, const int);
-"""
-
-MACROS = """
 /* Function signature changed to const char * in 1.1.0 */
 const char *SSL_CIPHER_get_version(const SSL_CIPHER *);
 /* These became macros in 1.1.0 */
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
index af2b6a77..2ae574a3 100644
--- a/src/_cffi_src/openssl/x509.py
+++ b/src/_cffi_src/openssl/x509.py
@@ -212,9 +212,6 @@ int i2d_DSAPrivateKey_bio(BIO *, DSA *);
 PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *,
                                                  PKCS8_PRIV_KEY_INFO **);
 void PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *);
-"""
-
-MACROS = """
 /* These became const X509 in 1.1.0 */
 int X509_get_ext_count(X509 *);
 X509_EXTENSION *X509_get_ext(X509 *, int);
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
index ff83981c..7a5e3dd6 100644
--- a/src/_cffi_src/openssl/x509_vfy.py
+++ b/src/_cffi_src/openssl/x509_vfy.py
@@ -182,9 +182,6 @@ int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *,
 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *, int);
 int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *);
 void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *);
-"""
-
-MACROS = """
 /* this CRYPTO_EX_DATA function became a macro in 1.1.0 */
 int X509_STORE_CTX_get_ex_new_index(long, void *, CRYPTO_EX_new *,
                                     CRYPTO_EX_dup *, CRYPTO_EX_free *);
diff --git a/src/_cffi_src/openssl/x509name.py b/src/_cffi_src/openssl/x509name.py
index ea1ccf6e..1be1ae51 100644
--- a/src/_cffi_src/openssl/x509name.py
+++ b/src/_cffi_src/openssl/x509name.py
@@ -36,9 +36,6 @@ int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
 int X509_NAME_cmp(const X509_NAME *, const X509_NAME *);
 X509_NAME *X509_NAME_dup(X509_NAME *);
 int Cryptography_X509_NAME_ENTRY_set(X509_NAME_ENTRY *);
-"""
-
-MACROS = """
 /* These became const X509_NAME * in 1.1.0 */
 int X509_NAME_entry_count(X509_NAME *);
 X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *, int);
diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py
index 945bb3a9..d31107fb 100644
--- a/src/_cffi_src/openssl/x509v3.py
+++ b/src/_cffi_src/openssl/x509v3.py
@@ -185,9 +185,6 @@ GENERAL_NAMES *GENERAL_NAMES_new(void);
 void GENERAL_NAMES_free(GENERAL_NAMES *);
 void *X509V3_EXT_d2i(X509_EXTENSION *);
 int X509_check_ca(X509 *);
-"""
-
-MACROS = """
 /* X509 became a const arg in 1.1.0 */
 void *X509_get_ext_d2i(X509 *, int, int *, int *);
 /* The last two char * args became const char * in 1.1.0 */
-- 
cgit v1.2.3