From 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 6 May 2015 09:49:30 -0400 Subject: Unapplying patches to prevent spurious conflicts. --- Cryptlib/Include/openssl/ec.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'Cryptlib/Include/openssl/ec.h') diff --git a/Cryptlib/Include/openssl/ec.h b/Cryptlib/Include/openssl/ec.h index 367307f9..8bc2a235 100644 --- a/Cryptlib/Include/openssl/ec.h +++ b/Cryptlib/Include/openssl/ec.h @@ -321,15 +321,7 @@ void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t); /* functions to set/get method specific data */ void *EC_KEY_get_key_method_data(EC_KEY *, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); -/** Sets the key method data of an EC_KEY object, if none has yet been set. - * \param key EC_KEY object - * \param data opaque data to install. - * \param dup_func a function that duplicates |data|. - * \param free_func a function that frees |data|. - * \param clear_free_func a function that wipes and frees |data|. - * \return the previously set data pointer, or NULL if |data| was inserted. - */ -void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, +void EC_KEY_insert_key_method_data(EC_KEY *, void *data, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); /* wrapper functions for the underlying EC_GROUP object */ void EC_KEY_set_asn1_flag(EC_KEY *, int); -- cgit v1.2.3