[PATCH] scripts: mxsimage: Fix build with OpenSSL < 1.1.x

[Lucas Stach]

Am Dienstag, den 31.01.2017, 15:29 +0100 schrieb Sascha Hauer:
> Move the compatibility wrapper functions up so that they
> are defined before they are used.
> 
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>

Tested-by: Lucas Stach <l.stach at pengutronix.de>

This fixes the build failures seen in the randcfg builder. Can you
please commit this?

> ---
>  scripts/mxsimage.c | 62 +++++++++++++++++++++++++++---------------------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/scripts/mxsimage.c b/scripts/mxsimage.c
> index bcbbf00..5c2c307 100644
> --- a/scripts/mxsimage.c
> +++ b/scripts/mxsimage.c
> @@ -410,6 +410,37 @@ static void make_crc_table(void)
>  	crc_table_valid = 1;
>  }
>  
> +/*
> + * OpenSSL 1.1.0 and newer compatibility functions:
> + * https://wiki.openssl.org/index.php/1.1_API_Changes
> + */
> +#if OPENSSL_VERSION_NUMBER < 0x10100000L
> +static void *OPENSSL_zalloc(size_t num)
> +{
> +	void *ret = OPENSSL_malloc(num);
> +
> +	if (ret != NULL)
> +		memset(ret, 0, num);
> +	return ret;
> +}
> +
> +EVP_MD_CTX *EVP_MD_CTX_new(void)
> +{
> +	return OPENSSL_zalloc(sizeof(EVP_MD_CTX));
> +}
> +
> +void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
> +{
> +	EVP_MD_CTX_cleanup(ctx);
> +	OPENSSL_free(ctx);
> +}
> +
> +int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
> +{
> +	return EVP_CIPHER_CTX_cleanup(ctx);
> +}
> +#endif
> +
>  uint32_t pbl_crc32(uint32_t in_crc, const char *buf, uint32_t len)
>  {
>  	uint32_t crc32_val;
> @@ -2292,37 +2323,6 @@ static int sb_verify_image_end(struct sb_image_ctx *ictx,
>  	return ret;
>  }
>  
> -/*
> - * OpenSSL 1.1.0 and newer compatibility functions:
> - * https://wiki.openssl.org/index.php/1.1_API_Changes
> - */
> -#if OPENSSL_VERSION_NUMBER < 0x10100000L
> -static void *OPENSSL_zalloc(size_t num)
> -{
> -	void *ret = OPENSSL_malloc(num);
> -
> -	if (ret != NULL)
> -		memset(ret, 0, num);
> -	return ret;
> -}
> -
> -EVP_MD_CTX *EVP_MD_CTX_new(void)
> -{
> -	return OPENSSL_zalloc(sizeof(EVP_MD_CTX));
> -}
> -
> -void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
> -{
> -	EVP_MD_CTX_cleanup(ctx);
> -	OPENSSL_free(ctx);
> -}
> -
> -int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
> -{
> -	return EVP_CIPHER_CTX_cleanup(ctx);
> -}
> -#endif
> -
>  static int sb_build_tree_from_img(struct sb_image_ctx *ictx)
>  {
>  	long filesize;