1 files changed, 20 insertions, 57 deletions
diff --git a/src/_cffi_src/openssl/hmac.py b/src/_cffi_src/openssl/hmac.py
index 86bbdfc2..b006e642 100644
--- a/src/_cffi_src/openssl/hmac.py
+++ b/src/_cffi_src/openssl/hmac.py
@@ -9,77 +9,40 @@ INCLUDES = """
 """
 
 TYPES = """
-typedef struct { ...; } HMAC_CTX;
+typedef ... HMAC_CTX;
 """
 
 FUNCTIONS = """
-void HMAC_CTX_init(HMAC_CTX *);
-void HMAC_CTX_cleanup(HMAC_CTX *);
+int HMAC_Init_ex(HMAC_CTX *, const void *, int, const EVP_MD *, ENGINE *);
+int HMAC_Update(HMAC_CTX *, const unsigned char *, size_t);
+int HMAC_Final(HMAC_CTX *, unsigned char *, unsigned int *);
+int HMAC_CTX_copy(HMAC_CTX *, HMAC_CTX *);
 
-int Cryptography_HMAC_Init_ex(HMAC_CTX *, const void *, int, const EVP_MD *,
-                              ENGINE *);
-int Cryptography_HMAC_Update(HMAC_CTX *, const unsigned char *, size_t);
-int Cryptography_HMAC_Final(HMAC_CTX *, unsigned char *, unsigned int *);
-int Cryptography_HMAC_CTX_copy(HMAC_CTX *, HMAC_CTX *);
-"""
-
-MACROS = """
+HMAC_CTX *Cryptography_HMAC_CTX_new(void);
+void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx);
 """
 
 CUSTOMIZATIONS = """
-int Cryptography_HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int key_len,
-                              const EVP_MD *md, ENGINE *impl) {
-#if OPENSSL_VERSION_NUMBER >= 0x010000000
-    return HMAC_Init_ex(ctx, key, key_len, md, impl);
+HMAC_CTX *Cryptography_HMAC_CTX_new(void) {
+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
+    return HMAC_CTX_new();
 #else
-    HMAC_Init_ex(ctx, key, key_len, md, impl);
-    return 1;
+    /* This uses OPENSSL_zalloc in 1.1.0, which is malloc + memset */
+    HMAC_CTX *ctx = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
+    memset(ctx, 0, sizeof(HMAC_CTX));
+    return ctx;
 #endif
 }
 
-int Cryptography_HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,
-                             size_t data_len) {
-#if OPENSSL_VERSION_NUMBER >= 0x010000000
-    return HMAC_Update(ctx, data, data_len);
-#else
-    HMAC_Update(ctx, data, data_len);
-    return 1;
-#endif
-}
 
-int Cryptography_HMAC_Final(HMAC_CTX *ctx, unsigned char *digest,
-    unsigned int *outlen) {
-#if OPENSSL_VERSION_NUMBER >= 0x010000000
-    return HMAC_Final(ctx, digest, outlen);
+void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx) {
+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
+    return HMAC_CTX_free(ctx);
 #else
-    HMAC_Final(ctx, digest, outlen);
-    return 1;
-#endif
-}
-
-int Cryptography_HMAC_CTX_copy(HMAC_CTX *dst_ctx, HMAC_CTX *src_ctx) {
-#if OPENSSL_VERSION_NUMBER >= 0x010000000
-    return HMAC_CTX_copy(dst_ctx, src_ctx);
-#else
-    HMAC_CTX_init(dst_ctx);
-    if (!EVP_MD_CTX_copy_ex(&dst_ctx->i_ctx, &src_ctx->i_ctx)) {
-        goto err;
-    }
-    if (!EVP_MD_CTX_copy_ex(&dst_ctx->o_ctx, &src_ctx->o_ctx)) {
-        goto err;
+    if (ctx != NULL) {
+        HMAC_CTX_cleanup(ctx);
+        OPENSSL_free(ctx);
     }
-    if (!EVP_MD_CTX_copy_ex(&dst_ctx->md_ctx, &src_ctx->md_ctx)) {
-        goto err;
-    }
-    memcpy(dst_ctx->key, src_ctx->key, HMAC_MAX_MD_CBLOCK);
-    dst_ctx->key_length = src_ctx->key_length;
-    dst_ctx->md = src_ctx->md;
-    return 1;
-
-    err:
-        return 0;
 #endif
 }
 """
-
-CONDITIONAL_NAMES = {}